[SCM] kconfigwidgets packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-10-gd5855c1

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit d5855c15fc6dcfca91981d45d1caf6032e105129
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:41:30 2015 -0700

    Clean merge.
---
 debian/changelog |  1 +
 debian/control   | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e77727a..5aaf8d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kconfigwidgets (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * Vivid backport
+  * Clean merge. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:09:15 -0700
 
diff --git a/debian/control b/debian/control
index 1d238ef..f2ba33e 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,6 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kconfigwidgets.git
 Package: libkf5configwidgets-dev
 Section: libdevel
 Architecture: any
-<<<<<<< HEAD
 Depends: libkf5auth-dev (>= 5.11.0~),
          libkf5codecs-dev (>= 5.11.0~),
          libkf5config-dev (>= 5.11.0~),
@@ -38,15 +37,6 @@ Depends: libkf5auth-dev (>= 5.11.0~),
          libkf5guiaddons-dev (>= 5.11.0~),
          libkf5i18n-dev (>= 5.11.0~),
          libkf5widgetsaddons-dev (>= 5.11.0~),
-=======
-Depends: libkf5auth-dev (>= 5.11.0),
-         libkf5codecs-dev (>= 5.11.0),
-         libkf5config-dev (>= 5.11.0),
-         libkf5configwidgets5 (= ${binary:Version}),
-         libkf5guiaddons-dev (>= 5.11.0),
-         libkf5i18n-dev (>= 5.11.0),
-         libkf5widgetsaddons-dev (>= 5.11.0),
->>>>>>> origin/kubuntu_vivid_backports
          ${misc:Depends}
 Description: development files for kconfigwidgets
  KConfigWidgets provides easy-to-use classes to create

-- 
kconfigwidgets packaging