aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml/preferences.xml
diff options
context:
space:
mode:
authorChristian Schneppe <kriztan@users.noreply.github.com>2018-09-27 18:42:25 +0200
committerGitHub <noreply@github.com>2018-09-27 18:42:25 +0200
commit4f4a52f068f3b3956aca5934531a48d1f90d7974 (patch)
treeda24e0f840730a75f2b3dab69a3b5f12025391be /src/main/res/xml/preferences.xml
parent1816092e68584b5794303578b6af6d621ffc58d4 (diff)
parentf4ac1f68feac3e3b19ab5932ede9d79dd14bff27 (diff)
Merge branch 'master' into bubble-into-avatar
Diffstat (limited to '')
-rw-r--r--src/main/res/xml/preferences.xml5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index d6241a5ff..819fcded9 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -203,11 +203,6 @@
android:key="video_compression"
android:summary="@string/pref_video_compression_summary"
android:title="@string/pref_video_compression" />
- <CheckBoxPreference
- android:defaultValue="@bool/return_to_previous"
- android:key="return_to_previous"
- android:summary="@string/pref_return_to_previous_summary"
- android:title="@string/pref_return_to_previous" />
</PreferenceScreen>
<!--status-->
<PreferenceScreen