[SCM] plasma-mediacenter packaging branch, kubuntu_stable, updated. ubuntu/4%5.4.3-0ubuntu1-16-g102702f

[Clive Johnston]

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

The following commit has been merged in the kubuntu_stable branch:
commit 102702f88013c3b9a2e3dff7e678ee5fe24174bf
Author: Clive Johnston <clivejo at aol.com>
Date:   Thu Jan 7 20:32:19 2016 +0000

    Fix merge
---
 debian/changelog | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e64ce7..df5972b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 plasma-mediacenter (4:5.5.1-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release Xenial
+  * Fix merge
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 18 Dec 2015 09:14:50 -0800
 
-<<<<<<< HEAD
 plasma-mediacenter (4:5.4.3-0ubuntu1) xenial; urgency=medium
 
   * New upstream bugfix release (LP: #1518598)
@@ -12,9 +12,6 @@ plasma-mediacenter (4:5.4.3-0ubuntu1) xenial; urgency=medium
  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:42:12 +0100
 
 plasma-mediacenter (4:5.4.2-0ubuntu1) wily; urgency=medium
-=======
-plasma-mediacenter (4:5.4.3-0ubuntu1) UNRELEASED; urgency=medium
->>>>>>> origin/kubuntu_stable
 
   * Create backports branch. 
   * New upstream bugfix release

-- 
plasma-mediacenter packaging