From 1a64e05e2f0595a98a341b437624a61c28b143c5 Mon Sep 17 00:00:00 2001
From: matlabbe <matlabbe@gmail.com>
Date: Sat, 26 Jun 2021 13:47:49 -0400
Subject: [PATCH] fixed code merged

---
 guilib/src/ui/preferencesDialog.ui | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/guilib/src/ui/preferencesDialog.ui b/guilib/src/ui/preferencesDialog.ui
index 94ee83c8..a52678d8 100644
--- a/guilib/src/ui/preferencesDialog.ui
+++ b/guilib/src/ui/preferencesDialog.ui
@@ -95,11 +95,7 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <property name="currentIndex">
-<<<<<<< HEAD
                 <number>13</number>
-=======
-                <number>19</number>
->>>>>>> eabf3e3d57572b30878512e47b051986c3592cea
                </property>
                <widget class="QWidget" name="page_22">
                 <layout class="QVBoxLayout" name="verticalLayout_29" stretch="0,1">