mirror of
https://github.com/hydralauncher/hydra.git
synced 2025-03-09 15:40:26 +00:00
fix: solve merge conflict markers
This commit is contained in:
parent
713392ee29
commit
e6b62399f7
1 changed files with 0 additions and 3 deletions
|
@ -19,10 +19,7 @@
|
|||
"follow_us": "Bizi takip et",
|
||||
"home": "Ana menü",
|
||||
"discord": "Discord'umuza katıl",
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"telegram": "Telegram'umuza katıl",
|
||||
>>>>>>> main
|
||||
"x": "X'te bizi takip et",
|
||||
"github": "GitHub'da bize katkı yap"
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue