[SCM] kiconthemes packaging branch, master, updated. debian/5.37.0-2-91-gfbba7f0

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ca8b87f19405d1a991b63272984d4eb3666424ec
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Jul 1 21:30:41 2015 +0200

    Fix incomplete merge
---
 debian/control | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/debian/control b/debian/control
index 7992418..1ab5f70 100644
--- a/debian/control
+++ b/debian/control
@@ -31,19 +31,11 @@ Description: Support for icon themes
 Package: libkf5iconthemes-dev
 Section: libdevel
 Architecture: any
-<<<<<<< HEAD
-Depends: libkf5configwidgets-dev (>= 5.10.0),
-         libkf5i18n-dev (>= 5.10.0),
-         libkf5iconthemes5 (= ${binary:Version}),
-         libkf5itemviews-dev (>= 5.10.0),
-         libkf5widgetsaddons-dev (>= 5.10.0),
-=======
 Depends: libkf5configwidgets-dev (>= 5.11.0~),
          libkf5i18n-dev (>= 5.11.0~),
          libkf5iconthemes5 (= ${binary:Version}),
          libkf5itemviews-dev (>= 5.11.0~),
          libkf5widgetsaddons-dev (>= 5.11.0~),
->>>>>>> master
          qtbase5-dev (>= 5.4),
          ${misc:Depends}
 Description: development files for kiconthemes

-- 
kiconthemes packaging