[SCM] plasma-nm packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-8-g7da9f12

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit e8c3f18bd1cce934c97cd7c4baea3054103812ec
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Dec 18 09:24:55 2015 -0800

    Fix merge.
---
 debian/changelog | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7461f8..f16937d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 plasma-nm (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:17:56 -0800
 
@@ -14,12 +15,9 @@ plasma-nm (4:5.4.3-0ubuntu1) xenial; urgency=medium
   * Fix merge. 
   * Remove patch from git.
   * Remove series file.. 
-<<<<<<<
-
-=======
   * Fix another merge.
->>>>>>>
-  [ Philip Muškovac ]
+  
+[ Philip Muškovac ]
   * New upstream bugfix release (LP: #1518598)
 
  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:43:42 +0100

-- 
plasma-nm packaging