user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
tom5079
2019-08-29 11:47:01 +09:00
parent c0bce4f3b1
commit d346cf431f
6 changed files with 1 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/xml/lock_preferences.xml
View File

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