Update preferences_themes.xml

2023-07-01 18:33:46 +03:00
parent 7a632d5224
commit 220c61afe1
1 changed files with 0 additions and 4 deletions
@@ -10,11 +10,7 @@
        <com.vtosters.lite.ui.MaterialSwitchPreference
                android:defaultValue="true"
                android:key="invalidate_theme_cache_each_update"
-<<<<<<< HEAD
                android:title="@string/invalidate_theme_cache_each_update_title"/>
-=======
-                android:title="@string/invalidate_theme_cache_title"/>
->>>>>>> b2028d86ba606fca09ca094082d7e68fbb59ef5c
        <Preference
                android:key="invalidate_theme_cache"
                android:title="@string/invalidate_theme_cache_title" />