[SCM] ksysguard packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.3-0ubuntu1-24-g8ac56f8

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 8ac56f8419b776cb9dd0dc036b63c693f8e50a17
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Feb 26 15:31:25 2016 -0800

    Another merge tag in copyright.
---
 debian/changelog | 1 +
 debian/copyright | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d6f42c6..1de356f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ksysguard (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Scarlett Clark ]
   * Fix copyright file merge. 
+  * Another merge tag in copyright.
 
  -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:11:41 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 09b0a22..8c866a1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -220,7 +220,6 @@ License: GPL
  --
  On Debian systems, the complete text of the GNU General Public License
  can be found in `/usr/share/common-licenses/GPL'.
->>>>>>> master
 
 Files: debian/*
 Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>

-- 
ksysguard packaging