[SCM] plasma-mediacenter packaging branch, kubuntu_vivid_backports, updated. ubuntu/4%5.4.2-0ubuntu1-10-g829eeb5

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 4bbaccc42d2d838e6ba9d5ab8d4454bf3eadeac1
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Oct 8 06:04:17 2015 -0700

    Files do not match. Manual merge.
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 137841f..0f07f14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 plasma-mediacenter (4:5.4.2-0ubuntu1) UNRELEASED; urgency=medium
 
-  * Vivid backport.
   * Fix version 
   * Vivid backport
+  * Files do not match. Manual merge. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 05 Oct 2015 12:11:18 -0700
 

-- 
plasma-mediacenter packaging