external/hydra
1
0
Fork 0
mirror of https://github.com/hydralauncher/hydra.git synced 2025-03-09 15:40:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: solve merge conflict markers

Browse source
This commit is contained in:
ChristoferMendes 2024-05-12 21:35:07 -03:00
parent 713392ee29
commit e6b62399f7
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/locales/tr/translation.json
View file

@ -19,10 +19,7 @@
"follow_us": "Bizi takip et", "follow_us": "Bizi takip et",
"home": "Ana menü", "home": "Ana menü",
"discord": "Discord'umuza katıl", "discord": "Discord'umuza katıl",
<<<<<<< HEAD
=======
"telegram": "Telegram'umuza katıl", "telegram": "Telegram'umuza katıl",
>>>>>>> main
"x": "X'te bizi takip et", "x": "X'te bizi takip et",
"github": "GitHub'da bize katkı yap" "github": "GitHub'da bize katkı yap"
}, },