[SCM] kdecoration packaging branch, kubuntu_wily_archive, updated. debian/5.2.2-1-17-gc5692e7

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit c5692e74af4409b6b845a86b06ce100083be1cea
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jul 2 12:24:17 2015 +0000

    fix merge
---
 debian/libkdecorations2private5.symbols | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/debian/libkdecorations2private5.symbols b/debian/libkdecorations2private5.symbols
index f562c11..ce31e8b 100644
--- a/debian/libkdecorations2private5.symbols
+++ b/debian/libkdecorations2private5.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
 libkdecorations2private.so.5 libkdecorations2private5 #MINVER#
  _ZN12KDecoration216DecorationBridge11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.1.50
  _ZN12KDecoration216DecorationBridge11qt_metacastEPKc at Base 5.1.50
@@ -34,11 +30,7 @@ libkdecorations2private.so.5 libkdecorations2private5 #MINVER#
  _ZN12KDecoration225DecorationSettingsPrivateD2Ev at Base 5.1.50
  _ZNK12KDecoration216DecorationBridge10metaObjectEv at Base 5.1.50
  _ZNK12KDecoration222DecoratedClientPrivate10decorationEv at Base 5.1.50
-<<<<<<< HEAD
- _ZNK12KDecoration222DecoratedClientPrivate5colorENS_10ColorGroupENS_9ColorRoleE at Base 4:5.2.2+git20150416.0912+15.04
-=======
  _ZNK12KDecoration222DecoratedClientPrivate5colorENS_10ColorGroupENS_9ColorRoleE at Base 4:5.3.0
->>>>>>> master
  _ZNK12KDecoration225DecorationSettingsPrivate11fontMetricsEv at Base 5.1.50
  _ZNK12KDecoration225DecorationSettingsPrivate12largeSpacingEv at Base 5.1.50+git20141213.0014+15.04
  _ZNK12KDecoration225DecorationSettingsPrivate12smallSpacingEv at Base 5.1.50+git20141213.0014+15.04

-- 
kdecoration packaging