BBC News reports:
A deal has been agreed in which Russia will receive compensation for France's decision last year to cancel the sale of two warships, both countries say.
France will fully refund Russia for the two helicopter carriers. The deal was worth €1.2bn (£838m; $1.3bn) and Russia made an advance payment of about €840m.
The Kremlin says that it now considers the dispute to be fully resolved.
French President Francois Hollande's office said that Russia will be "fully reimbursed" for the two warships.
It said that France will keep both vessels.