diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-08-11 15:29:30 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-08-11 15:29:30 +0200 |
| commit | a1a09ff057ed9aa0e29be588c53d33355d4d6ec4 (patch) | |
| tree | 58e3f4f39c4524250c6fabf5fb8f7c1479b42aed /src/main/res/xml/preferences.xml | |
| parent | eac4bf7d902dc2579983daa29bcb74ca14790de6 (diff) | |
Compile Clean after mergetrz/merge_1.5.2
Diffstat (limited to 'src/main/res/xml/preferences.xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index f0583227..9def87c4 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -56,7 +56,6 @@ android:key="chat_states" android:summary="@string/pref_chat_states_summary" android:title="@string/pref_chat_states" /> -<<<<<<< HEAD <CheckBoxPreference android:defaultValue="true" android:key="parse_emoticons" @@ -67,23 +66,6 @@ <PreferenceScreen android:summary="@string/pref_notification_settings" android:title="@string/pref_notifications" > -======= - - </PreferenceCategory> - <PreferenceCategory - android:title="@string/pref_notification_settings" - android:key="notifications"> - <CheckBoxPreference - android:defaultValue="true" - android:key="show_notification" - android:summary="@string/pref_notifications_summary" - android:title="@string/pref_notifications" /> - <PreferenceScreen - android:dependency="show_notification" - android:summary="@string/pref_quiet_hours_summary" - android:title="@string/title_pref_quiet_hours" - android:key="quiet_hours"> ->>>>>>> 1.5.2 <CheckBoxPreference android:defaultValue="true" android:key="show_notification" |