From cb9def28f8573687aff9b732b593a319edfd77bb Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Fri, 28 Jun 2024 23:21:37 +0100
Subject: [PATCH] Removed stray text from poor conflict resolution

---
 src/lime_qt/configuration/configure_layout.ui | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lime_qt/configuration/configure_layout.ui b/src/lime_qt/configuration/configure_layout.ui
index ff1dcf94d..cca9e1186 100644
--- a/src/lime_qt/configuration/configure_layout.ui
+++ b/src/lime_qt/configuration/configure_layout.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>440</width>
+    <width>705</width>
     <height>950</height>
    </rect>
   </property>
@@ -392,7 +392,6 @@
        </widget>
       </item>
      </layout>
->>>>>>> b2607fd99 (citra_qt: Remove scroll bar from Layout and Enhancements tabs):src/citra_qt/configuration/configure_layout.ui
     </widget>
    </item>
    <item>