Resolved Merge Conflicts

This commit is contained in:
JohnVictoryz
2024-03-08 17:31:45 +02:00
parent 134054a352
commit c75f292f17
2 changed files with 3 additions and 7 deletions

View File

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

View File

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