fix: solve merge conflict markers

This commit is contained in:
ChristoferMendes 2024-05-12 21:35:07 -03:00
parent 713392ee29
commit e6b62399f7

View file

@ -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"
},