From kde-commits  Sat Oct 31 23:25:37 2015
From: Steve Allewell <steve.allewell () gmail ! com>
Date: Sat, 31 Oct 2015 23:25:37 +0000
To: kde-commits
Subject: [kxstitch] ui: Fix error in merge conflict resolution
Message-Id: <E1ZsfWj-0000Bz-4O () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=144633394900734

Git commit 8f70802b98d0ae1f578ffbbc583499c111911edc by Steve Allewell.
Committed on 31/10/2015 at 23:08.
Pushed by sallewell into branch 'master'.

Fix error in merge conflict resolution

M  +0    -4    ui/PaletteManager.ui

http://commits.kde.org/kxstitch/8f70802b98d0ae1f578ffbbc583499c111911edc

diff --git a/ui/PaletteManager.ui b/ui/PaletteManager.ui
index 799f990..5d5c7a5 100644
--- a/ui/PaletteManager.ui
+++ b/ui/PaletteManager.ui
@@ -23,10 +23,6 @@
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item row=3D"0" column=3D"6" colspan=3D"2">
-    <layout class=3D"QHBoxLayout" name=3D"horizontalLayout">
      <item>
       <widget class=3D"QListWidget" name=3D"CurrentList"/>
      </item>