[SCM] kwin packaging branch, kubuntu_unstable, updated. debian/5.4.2-1-131-g1e20428

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 1e204288f272be62ee69a3ec22de02f2cf4f40ff
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Jan 12 06:37:48 2016 -0800

    Remove merge markers from changelog.
---
 debian/changelog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a88592..9525834 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ kwin (4:5.5.2-0ubuntu1) UNRELEASED; urgency=medium
   * Remove another duplicate cruft from bad merge. 
   * Remove merge cruft from the dbg package... 
   * Remove merge markers. 
+  * Remove merge markers from changelog. 
 
  -- Clive Johnston <clivejo at aol.com>  Tue, 29 Dec 2015 17:46:44 +0000
 
@@ -285,8 +286,6 @@ kwin (4:5.3.1-1~) wily; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:52:39 +0200
 
-=======
->>>>>>>
 kwin (4:5.3.1-0ubuntu3) wily; urgency=medium
 
   * No-change rebuild against Qt 5.4.2.

-- 
kwin packaging