Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Diego Salazar
monero-site
Commits
3d65589d
Unverified
Commit
3d65589d
authored
May 06, 2019
by
erciccione
Browse files
remove conflict markers from fr.yml
parent
95b63fb1
Changes
1
Hide whitespace changes
Inline
Side-by-side
_i18n/fr.yml
View file @
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
roadmap
:
translated
:
"
yes"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment