[SCM] plasma-workspace packaging branch, kubuntu_xenial_archive, updated. debian/5.4.3-1-92-g1e3b84e

[Clive Johnston]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 1e3b84eec7a92ea24e48ecd199a6496583fa3d35
Author: Clive Johnston <clivejo at aol.com>
Date:   Wed Jan 27 20:59:58 2016 +0000

    Fixing merge madness
---
 debian/changelog | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24623d6..d41b7fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ plasma-workspace (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
   * Version number is coming up None. Trying a different approach 
     with appending a. 
   * Silly me, lost the ubuntu in the version. Final fix I hope.
+  * Merge xenial_archive manual.
 
   [ Clive Johnston ]
   * new upstream release
@@ -14,16 +15,8 @@ plasma-workspace (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
     into plasma-workspace-wayland.install
   * New upstream release
 
-<<<<<<< HEAD
   [ Philip Muškovac ]
   * Merge with debian git master 
-=======
-  [ Scarlett Clark ]
-  * Merge xenial_archive manual. 
->>>>>>> origin/kubuntu_stable
-
-  [ Clive Johnston ]
-  * New upstream release
 
  -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:19:19 +0000
 

-- 
plasma-workspace packaging