[SCM] attica packaging branch, master, updated. debian/5.37.0-2-104-gbedaaba

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 68afab891db71a4fbdc46225064040f63af9fa66
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Sep 29 15:20:39 2015 -0700

    Merge nightmare.
---
 debian/changelog | 3 ++-
 debian/control   | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 413c897..5ea8cde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ attica-kf5 (5.14.0-0ubuntu1) UNRELEASED; urgency=medium
   [ Scarlett Clark ]
   * Vivid backport. 
   * Manual merge, fix changelog failure.
+  * Merge nightmare. 
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 29 Sep 2015 14:53:15 -0700  
+ -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 29 Sep 2015 14:53:15 -0700
 
 attica-kf5 (5.13.0-0ubuntu1) wily; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4c5f34d..9bc3055 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,8 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12),
                debhelper (>= 9),
-<<<<<<< HEAD
-               extra-cmake-modules (>= 5.14.0),
-=======
                extra-cmake-modules (>= 5.14.0~),
->>>>>>> origin/kubuntu_unstable
-               pkg-kde-tools (>= 0.15.15ubuntu1~),
+               pkg-kde-tools (>= 0.15.15~),
                qtbase5-dev (>= 5.4)
 Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest

-- 
attica packaging