France and Russia have agreed compensation over the stalled sale of two warships.
Paris cancelled Russia’s purchase of two Mistral helicopter carriers after conflict broke out in eastern Ukraine.
The deal was worth €1.2bn and Moscow made an advance payment of €840m.
According to the Kremlin France has already returned the money.
The office of French President Francois Holland says once the Russian equipment has been removed from the vessels France will take charge of the ships.
Moscow says the dispute is now fully resolved.