From 31aa6c9ff7d1bf0d4625741181d3ecee8e69e72a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schu=CC=88ller?= <stefan.schueller@i-web.ch>
Date: Fri, 19 Jun 2020 19:24:21 +0200
Subject: [PATCH] Fixed merge issue

---
 app/src/main/res/xml/pref_general.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index b455df9..e7c3dd8 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -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"