[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kxstitch] ui: Fix error in merge conflict resolution
From:       Steve Allewell <steve.allewell () gmail ! com>
Date:       2015-10-31 23:25:37
Message-ID: E1ZsfWj-0000Bz-4O () scm ! kde ! org
[Download RAW message or body]

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="0" column="6" colspan="2">
-    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QListWidget" name="CurrentList"/>
      </item>
[prev in list] [next in list] [prev in thread] [next in thread]