[SCM] kompare packaging branch, kubuntu_xenial_archive, updated. debian/15.08.1-1-13-gdd12511

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kompare.git;a=commitdiff;h=dd12511

The following commit has been merged in the kubuntu_xenial_archive branch:
commit dd12511bf8b6eca4e733c6f40df23eb9abf697b0
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Feb 18 15:07:25 2016 -0800

    Remove merge conflict tag from changelog.
---
 debian/changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index afb59b0..3ec1a2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 kompare (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Clive Johnston ]
   * New upstream release
   * Merged with Debian 
 
+  [ Scarlett Clark ]
+  * Remove merge conflict tag from changelog. 
+
  -- Clive Johnston <clivejo at aol.com>  Sat, 06 Feb 2016 17:54:24 +0000
 
 kompare (4:15.12.0-1) experimental; urgency=medium
@@ -39,7 +43,6 @@ kompare (4:15.08.0-1) unstable; urgency=medium
   * Update copyright file.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Sep 2015 12:01:35 +0200
->>>>>>> master
 
 kompare (4:15.08.0-0ubuntu1) wily; urgency=medium
 

-- 
kompare packaging