conflicts

This commit is contained in:
tutel
2024-06-25 17:49:37 +03:00
parent 03eec80cca
commit 3e5ba3392e
2 changed files with 1 additions and 2 deletions

View File

@@ -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

View File

@@ -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>