From c75f292f17b1710665dc9fe052917a5bddd7d3b7 Mon Sep 17 00:00:00 2001
From: JohnVictoryz <john.g.zioupos@gmail.com>
Date: Fri, 8 Mar 2024 17:31:45 +0200
Subject: [PATCH] Resolved Merge Conflicts

---
 app/src/main/res/layout/activity_player_settings.xml | 4 ++--
 app/src/main/res/values/strings.xml                  | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/activity_player_settings.xml b/app/src/main/res/layout/activity_player_settings.xml
index 98358632..8a6fd187 100644
--- a/app/src/main/res/layout/activity_player_settings.xml
+++ b/app/src/main/res/layout/activity_player_settings.xml
@@ -452,7 +452,7 @@
                     android:minHeight="64dp"
                     android:paddingStart="32dp"
                     android:paddingEnd="32dp"
-                    android:text="@string/time_stamps_auto_hide"
+                    android:text="Auto Hide Time Stamps"
                     android:textAlignment="viewStart"
                     android:textColor="@color/bg_opp"
                     app:cornerRadius="0dp"
@@ -469,7 +469,7 @@
                     android:fontFamily="@font/poppins_family"
                     android:paddingStart="32dp"
                     android:paddingEnd="32dp"
-                    android:text="@string/time_stamps_auto_hide_desc"
+                    android:text="Make the skip time stamp button disappear after 5 seconds"
                     android:textSize="14sp" />
 
                 <com.google.android.material.materialswitch.MaterialSwitch
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3d60da1..22054e49 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -685,8 +685,4 @@
     <string name="about_me">About me</string>
     <string name="follow">Follow</string>
 
-    <string name="time_stamps_auto_hide">Auto Hide Time Stamps</string>
-    <string name="time_stamps_auto_hide_desc">Make the skip time stamp button disappear after 5 seconds</string>
-
-
-</resources>
+</resources>
\ No newline at end of file