Skip to content

remove conflict markers from fr.yml

erciccione requested to merge erciccione/monero-site:fix-build2 into master

I must have made a mistake while rebasing !1061 (merged) and the conflict marker got in, sorry. Fixed and now everything builds fine.

Merge request reports