From 68be24ac1df51281497fa39995cdeee08094c54f Mon Sep 17 00:00:00 2001
From: JJones780 <JJones780@users.noreply.github.com>
Date: Sat, 9 Feb 2019 03:51:15 -0700
Subject: [PATCH] Fixed merge conflicts.

---
 ui/settings.glade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/settings.glade b/ui/settings.glade
index 665ce6f1..aa74c201 100644
--- a/ui/settings.glade
+++ b/ui/settings.glade
@@ -2016,7 +2016,7 @@ they are not blocking!&lt;/i&gt;</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label36">
+                      <object class="GtkLabel" id="label36a">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Offset first page this many pages when &lt;b&gt;Pair Pages&lt;/b&gt; enabled</property>
@@ -2041,7 +2041,7 @@ they are not blocking!&lt;/i&gt;</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkLabel" id="label58">
+                              <object class="GtkLabel" id="label58a">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="tooltip_markup" translatable="yes">Offset first page this many pages when &lt;b&gt;Pair Pages&lt;/b&gt; enabled</property>