[SCM] khelpcenter packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-35-g9a6c755

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 7617e8d074e9afc2426303e54977c108cc6fdb66
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Dec 11 13:36:42 2015 -0800

    Remove merge marker.
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 70f20f1..a9d3fab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 khelpcenter (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
 
   * Debian merge: No remaining changes. 
+  * Remove merge marker. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 04 Dec 2015 20:03:38 -0800
 
@@ -82,7 +83,6 @@ khelpcenter (4:5.3.2-1) unstable; urgency=medium
   * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 20:39:15 +0200
->>>>>>> master
 
 khelpcenter (4:5.3.1-0ubuntu2) wily; urgency=medium
 

-- 
khelpcenter packaging