Mascali
/
shapez.io
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolved merge conflict

This commit is contained in:
Pascal Grossé 2020-06-18 18:46:23 +02:00
parent f116eb2460
commit 11749625bd
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
translations/base-fr.yaml
View File

@ -156,11 +156,7 @@ mainMenu:
contestOver: Ce concours est terminé - Rejoignez le serveur discord pour être tenu au courant des prochains concours !
continue: Continuer
newGame: Nouvelle partie
<<<<<<< HEAD
madeBy: Écrit par <author-link>
=======
madeBy: Créé par <author-link>
>>>>>>> d6c1cb15f6854d88490fb76d3f5fe4729b3477be
dialogs:
buttons: