IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conclict

Browse Source
This commit is contained in:
ogerly 2021-07-15 21:19:04 +02:00
commit a66501b0a4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/locales/en.json
View File

@ -43,7 +43,11 @@
"close":"Close", "close":"Close",
"edit": "Edit", "edit": "Edit",
"save": "save", "save": "save",
<<<<<<< HEAD
"recipient":"Recipient", "recipient":"Recipient",
=======
"receiver":"Recipient",
>>>>>>> 86e253ac0495b36b1ce3a07eeb9d35dae9abced2
"sender":"Sender", "sender":"Sender",
"username":"Username", "username":"Username",
"firstname":"Firstname", "firstname":"Firstname",