[SCM] plasma-mediacenter packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.2-0ubuntu1-11-g02e8051

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 02e8051a6f383f73e42c717cba83b3779e174a9d
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Oct 12 14:35:22 2015 +0200

    fix changelog format by removing merge marker left from previous commit
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 20ae82f..056ea92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,7 +50,6 @@ plasma-mediacenter (5.3.1-1~) UNRELEASED; urgency=medium
   * New upstream release (5.3.1).
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:54:15 +0200
->>>>>>> origin/kubuntu_unstable
 
 plasma-mediacenter (4:5.3.0-0ubuntu1) UNRELEASED; urgency=medium
 

-- 
plasma-mediacenter packaging