From e6b62399f79b8cefc739a8fa81cd7965a544bea9 Mon Sep 17 00:00:00 2001
From: ChristoferMendes <christoferluizdsm@gmail.com>
Date: Sun, 12 May 2024 21:35:07 -0300
Subject: [PATCH] fix: solve merge conflict markers

---
 src/locales/tr/translation.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/locales/tr/translation.json b/src/locales/tr/translation.json
index 5a5f879e..efeb5fd1 100644
--- a/src/locales/tr/translation.json
+++ b/src/locales/tr/translation.json
@@ -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"
   },