[SCM] kparts packaging branch, master, updated. debian/5.37.0-2-83-g5a53f7e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7fbe64c909dd9fe1bcc37bdd88acafe1036fb741
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Jul 13 15:54:52 2015 +0200

    remove merge markers
---
 debian/changelog | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43528f5..eda66b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,15 @@
-<<<<<<< HEAD
 kparts (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release
 
  -- 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