Fixed merge issue
This commit is contained in:
parent
7ead073ca9
commit
31aa6c9ff7
@ -30,12 +30,6 @@
|
||||
android:summary="@string/pref_description_back_pause"
|
||||
android:title="@string/pref_title_back_pause" />
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="true"
|
||||
android:key="pref_back_pause"
|
||||
android:summary="@string/pref_description_back_pause"
|
||||
android:title="@string/pref_title_back_pause" />
|
||||
|
||||
<ListPreference
|
||||
android:defaultValue="@array/empty_array"
|
||||
android:entries="@array/supportedLanguagesArray"
|
||||
|
Loading…
Reference in New Issue
Block a user