From da91a9a5b64a6612ffaaf3dabb3da5911d9115e5 Mon Sep 17 00:00:00 2001
From: codestation <codestation404@gmail.com>
Date: Sun, 27 Apr 2014 02:05:51 -0430
Subject: [PATCH] Fix merged changed.

---
 src/forms/configwidget.ui | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/forms/configwidget.ui b/src/forms/configwidget.ui
index 668e67e..39720e8 100644
--- a/src/forms/configwidget.ui
+++ b/src/forms/configwidget.ui
@@ -7,11 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>520</width>
-<<<<<<< Updated upstream
-    <height>405</height>
-=======
     <height>432</height>
->>>>>>> Stashed changes
    </rect>
   </property>
   <property name="windowTitle">