[SCM] libkscreen packaging branch, kubuntu_stable, updated. ubuntu/4%5.4.3-0ubuntu1-56-g37a26b0

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_stable branch:
commit 9b4d71d5ad4e61fae8f15a3908218cec3652a1cc
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Sat Dec 19 08:46:27 2015 -0800

    Fix symbols file merge markers.
---
 debian/changelog             |  1 +
 debian/libkf5screen7.symbols | 12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30e4ad2..70e8d5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libkscreen (4:5.5.1-0ubuntu2) UNRELEASED; urgency=medium
 
   * Fix unstable build to reflect the .so version of 7.
   * Add the new files and fix the install file. 
+  * Fix symbols file merge markers. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Sat, 19 Dec 2015 08:10:24 -0800
 
diff --git a/debian/libkf5screen7.symbols b/debian/libkf5screen7.symbols
index b00d77e..e12ccfc 100644
--- a/debian/libkf5screen7.symbols
+++ b/debian/libkf5screen7.symbols
@@ -162,11 +162,7 @@ libKF5Screen.so.6 libkf5screen7 #MINVER#
  _ZN7KScreen6Output11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.1.1
  _ZN7KScreen6Output11qt_metacastEPKc at Base 5.1.1
  _ZN7KScreen6Output11setRotationENS0_8RotationE at Base 5.1.1
-<<<<<<< HEAD
- _ZN7KScreen6Output11sizeChangedEv at Base 4:5.3.95
-=======
  _ZN7KScreen6Output11sizeChangedEv at Base 4:5.4.0
->>>>>>> master
  _ZN7KScreen6Output12setConnectedEb at Base 5.1.1
  _ZN7KScreen6Output13clonesChangedEv at Base 5.1.1
  _ZN7KScreen6Output13outputChangedEv at Base 5.1.1
@@ -184,11 +180,7 @@ libKF5Screen.so.6 libkf5screen7 #MINVER#
  _ZN7KScreen6Output7setEdidERK10QByteArray at Base 5.1.1
  _ZN7KScreen6Output7setIconERK7QString at Base 5.1.1
  _ZN7KScreen6Output7setNameERK7QString at Base 5.1.1
-<<<<<<< HEAD
- _ZN7KScreen6Output7setSizeERK5QSize at Base 4:5.3.95
-=======
  _ZN7KScreen6Output7setSizeERK5QSize at Base 4:5.4.0
->>>>>>> master
  _ZN7KScreen6Output7setTypeENS0_4TypeE at Base 5.1.1
  _ZN7KScreen6Output8setModesERK4QMapI7QString14QSharedPointerINS_4ModeEEE at Base 5.1.1
  _ZN7KScreen6Output9setClonesE5QListIiE at Base 5.1.1
@@ -279,11 +271,7 @@ libKF5Screen.so.6 libkf5screen7 #MINVER#
  _ZNK7KScreen6Output4iconEv at Base 5.1.1
  _ZNK7KScreen6Output4modeERK7QString at Base 5.1.1
  _ZNK7KScreen6Output4nameEv at Base 5.1.1
-<<<<<<< HEAD
- _ZNK7KScreen6Output4sizeEv at Base 4:5.3.95
-=======
  _ZNK7KScreen6Output4sizeEv at Base 4:5.4.0
->>>>>>> master
  _ZNK7KScreen6Output4typeEv at Base 5.1.1
  _ZNK7KScreen6Output5cloneEv at Base 5.1.1
  _ZNK7KScreen6Output5modesEv at Base 5.1.1

-- 
libkscreen packaging