[SCM] kdecoration packaging branch, kubuntu_wily_archive, updated. debian/5.2.2-1-15-g1e28f4b

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kdecoration.git;a=commitdiff;h=1e28f4b

The following commit has been merged in the kubuntu_wily_archive branch:
commit 1e28f4b9b301755c1f100a73e68354348133d4fc
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 20:45:37 2015 +0200

    fix symbols
---
 debian/libkdecorations2-5.symbols | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/debian/libkdecorations2-5.symbols b/debian/libkdecorations2-5.symbols
index 8d93fc7..7768b7c 100644
--- a/debian/libkdecorations2-5.symbols
+++ b/debian/libkdecorations2-5.symbols
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# SymbolsHelper-Confirmed: 4:5.2.2+git20150416.0912+15.04 amd64 i386
-=======
 # SymbolsHelper-Confirmed: 4:5.3.0 amd64
->>>>>>> master
 libkdecorations2.so.5 libkdecorations2-5 #MINVER#
  _ZN12KDecoration210Decoration10setBordersERK8QMargins at Base 5.1.50
  _ZN12KDecoration210Decoration10wheelEventEP11QWheelEvent at Base 5.1.50
@@ -233,13 +229,8 @@ libkdecorations2.so.5 libkdecorations2-5 #MINVER#
  _ZNK12KDecoration215DecoratedClient21isMaximizedVerticallyEv at Base 5.1.50
  _ZNK12KDecoration215DecoratedClient23isMaximizedHorizontallyEv at Base 5.1.50
  _ZNK12KDecoration215DecoratedClient4iconEv at Base 5.1.50
-<<<<<<< HEAD
- _ZNK12KDecoration215DecoratedClient5colorEN8QPalette10ColorGroupENS1_9ColorRoleE at Base 4:5.2.2+git20150416.0912+15.04
- _ZNK12KDecoration215DecoratedClient5colorENS_10ColorGroupENS_9ColorRoleE at Base 4:5.2.2+git20150416.0912+15.04
-=======
  _ZNK12KDecoration215DecoratedClient5colorEN8QPalette10ColorGroupENS1_9ColorRoleE at Base 4:5.3.0
  _ZNK12KDecoration215DecoratedClient5colorENS_10ColorGroupENS_9ColorRoleE at Base 4:5.3.0
->>>>>>> master
  _ZNK12KDecoration215DecoratedClient5widthEv at Base 5.1.50
  _ZNK12KDecoration215DecoratedClient6heightEv at Base 5.1.50
  _ZNK12KDecoration215DecoratedClient7captionEv at Base 5.1.50

-- 
kdecoration packaging