[SCM] plasma-sdk packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.3-0ubuntu1-25-gc37fc0b

[Clive Johnston]

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

The following commit has been merged in the kubuntu_unstable branch:
commit c37fc0b2cac23448b809a0c0624491862d243a0e
Author: Clive Johnston <clivejo at aol.com>
Date:   Fri Mar 4 22:00:15 2016 +0000

    Removing merge markers from changelog
---
 debian/changelog | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee2b8bd..f549726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,15 +85,12 @@ plasma-sdk (4:5.3.95-0ubuntu1) wily; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 23:20:55 +0200
 
-<<<<<<< HEAD
 plasma-sdk (4:5.3.2-0ubuntu1) wily; urgency=medium
 
   * Update install files.
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:37:30 +0000
 
-=======
->>>>>>> origin/kubuntu_xenial_archive
 plasma-sdk (5.3.2-1) unstable; urgency=medium
 
   * New upstream release (5.3.2).

-- 
plasma-sdk packaging