Merge conflicts

2019-08-29 11:47:01 +09:00
parent c0bce4f3b1
commit d346cf431f
6 changed files with 1 additions and 89 deletions
--- a/app/src/main/res/xml/lock_preferences.xml
+++ b/app/src/main/res/xml/lock_preferences.xml
@@ -15,11 +15,7 @@
        app:key="lock_password"/>

    <PreferenceCategory
-<<<<<<< HEAD
        app:title="@string/settings_lock_biometrics">
-=======
-        app:title="@string/settings_lock_biomatrics">
->>>>>>> origin/development

        <Preference
            app:title="@string/settings_lock_fingerprint"
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -69,14 +69,10 @@
            app:title="@string/settings_dark_mode_title"
            app:summary="@string/settings_dark_mode_summary"/>

-<<<<<<< HEAD
        <SwitchPreference
            app:key="nomedia"
            app:title="@string/settings_nomedia_title"
            app:summary="@string/settings_nomedia_title"/>
-
-=======
->>>>>>> origin/development
    </PreferenceCategory>

 </androidx.preference.PreferenceScreen>