[SCM] kparts packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-6-g352144f

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kparts.git;a=commitdiff;h=352144f

The following commit has been merged in the kubuntu_wily_archive branch:
commit 352144f0b94d7cd6442aab21d3cde83efe4004c4
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Jul 14 22:07:29 2015 -0700

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

diff --git a/debian/changelog b/debian/changelog
index 43528f5..4e25f4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,16 @@
-<<<<<<< HEAD
 kparts (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release
+  *  Fix merge.
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:20:19 -0700
-=======
+
 kparts (5.11.0-1) unstable; urgency=medium
 
   * New upstream release (5.10.0).
   * New upstream release (5.11.0).
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 10:31:58 +0200
->>>>>>> origin/kubuntu_unstable
 
 kparts (5.10.0-0ubuntu1) wily; urgency=medium
 

-- 
kparts packaging