From 3e5ba3392e6b78632823d4d1216b54cf8082ab25 Mon Sep 17 00:00:00 2001
From: tutel <john.g.zioupos@gmail.com>
Date: Tue, 25 Jun 2024 17:49:37 +0300
Subject: [PATCH] conflicts

---
 app/src/main/java/ani/dantotsu/Functions.kt | 1 -
 app/src/main/res/values/strings.xml         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/Functions.kt b/app/src/main/java/ani/dantotsu/Functions.kt
index 464161f8..0c922944 100644
--- a/app/src/main/java/ani/dantotsu/Functions.kt
+++ b/app/src/main/java/ani/dantotsu/Functions.kt
@@ -96,7 +96,6 @@ import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.databinding.ItemCountDownBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.notifications.IncognitoNotificationClickReceiver
-import ani.dantotsu.others.LanguageMapper
 import ani.dantotsu.others.SpoilerPlugin
 import ani.dantotsu.parsers.ShowResponse
 import ani.dantotsu.settings.saving.PrefManager
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index be8aac31..7aa449f8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1017,5 +1017,5 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
     <string name="video_search_test">Video Search Test: %1$s</string>
     <string name="image_search_test">Image Search Test: %1$s</string>
     <string name="book_search_test">Book Search Test: %1$s</string>
-    <string name="subtitle_langauge">Subtitle Langauge</string>
+
 </resources>