[SCM] kwin packaging branch, kubuntu_unstable, updated. debian/5.4.2-1-129-g06b1f91

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 06b1f91649a97c1bf70bf8a5f0fe855798f11667
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Jan 5 07:21:52 2016 -0800

    Remove merge markers.
---
 debian/changelog | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 891abf7..6a88592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,8 @@ kwin (4:5.5.2-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release Xenial.
   * Batchpatch symbols amd64,i386.
   * Debian Merge: Remaining changes:
-     Changes for new release.
-     Build libkwinglutils7 on any architecture, unbreaks build on armhf
+    Changes for new release.
+    Build libkwinglutils7 on any architecture, unbreaks build on armhf
 
   [ Clive Johnston ]
   * new upstream release
@@ -20,6 +20,7 @@ kwin (4:5.5.2-0ubuntu1) UNRELEASED; urgency=medium
   * Fix merge duplications. 
   * Remove another duplicate cruft from bad merge. 
   * Remove merge cruft from the dbg package... 
+  * Remove merge markers. 
 
  -- Clive Johnston <clivejo at aol.com>  Tue, 29 Dec 2015 17:46:44 +0000
 
@@ -253,16 +254,12 @@ kwin (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 02 Jul 2015 11:40:54 -0700
 
-<<<<<<<
 kwin (4:5.3.2-0ubuntu1) wily; urgency=medium
 
   * New upstream release
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:29:50 +0000
 
-=======
->>>>>>>
-<<<<<<<
 kwin (4:5.3.1-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
@@ -280,9 +277,6 @@ kwin (4:5.3.1-0ubuntu1) wily; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Jun 2015 20:27:57 +0200
 
-=======
->>>>>>>
-<<<<<<<
 kwin (4:5.3.1-1~) wily; urgency=medium
 
   * New upstream release (5.3.0).

-- 
kwin packaging