The interior ministers of Spain and Morocco defused tensions Monday in the wake of incidents on the border of the Spanish enclave of Melilla, dpa quored Spanish and Moroccan media as reporting.
"We have agreed to put that in the past," Spanish Interior Minister Alfredo Perez Rubalcaba said after the meeting. "It's over."
Morocco had accused Spanish police of using violence against Moroccans trying to enter the enclave of 70,000 residents, which Morocco has long claimed as its own.
Perez Rubalcaba held talks in Moroccan capital Rabat with his counterpart Taieb Cherqaoui and Moroccan security officials.
The Spanish minister had previously met with Moroccan King Mohammed VI in Casablanca, in an unusual gesture that was interpreted as a sign of friendship in Spain.
Perez Rubalcaba and Cherqaoui agreed to intensify the cooperation of their countries' police corps, and discussed security cooperation in areas such as illegal immigration, drug trafficking, organized crime and terrorism, according to the official Moroccan news agency MAP.
The Spanish government had already declared that the tension was dying down after the situation calmed on the Melilla border.
Over the past two weeks, Moroccan activists held demonstrations against alleged police brutality in Morocco and on the Melilla border, preventing food trucks from entering the Spanish city. Spain denied any wrongdoing by its police forces.
Spanish commentators speculated that Rabat may have wanted to pressure Madrid to support Morocco's attempts to secure its ownership of Western Sahara.
The Spanish and Moroccan foreign ministers are also scheduled to meet next month.