[SCM] libksysguard packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%5.4.3-0ubuntu1-44-ge30de8a

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit e30de8af2d2731a0fd569da79e6d3a493f85c1ef
Author: Philip Muškovac <yofel at gmx.net>
Date:   Sat Jan 16 12:47:24 2016 +0100

    Remove merge artifacts from changelog
---
 debian/changelog | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5606e86..fb8497f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -150,11 +150,7 @@ libksysguard (4:5.3.1-0ubuntu1) wily; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:36:19 +0200
 
-<<<<<<<
-libksysguard (4:5.3.1-1~) wily; urgency=medium
-=======
 libksysguard (4:5.3.1-1) unstable; urgency=medium
->>>>>>>
 
   * New upstream release (5.3.0).
   * New upstream release (5.3.1).

-- 
libksysguard packaging