Commit 53556a65 authored by luigi1111's avatar luigi1111
Browse files

Merge !1070

remove conflict markers from fr.yml

See merge request !1070
parents 95b63fb1 3d65589d
......@@ -443,11 +443,7 @@ user-guides:
restore-from-keys: Restaurer un portefeuille depuis les clefs
nicehash: Comment miner Monero sans équipement d'extraction minière
ledger-wallet-cli: Comment générer un portefeuille Monero Ledger avec la CLI (monero-wallet-cli)
<<<<<<< HEAD
multisig-messaging-system: Transactions multi-signatures avec MMS et le portefeuille CLI
multisig-messaging-system: Multisig transactions with MMS and CLI wallet
>>>>>>> add missing i18n keys and values in the languages files
translated: "yes"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment