[SCM] breeze packaging branch, kubuntu_unstable, updated. 9e4a255166abf4d330a433c0a477e043861e78d2

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/breeze.git;a=commitdiff;h=9e4a255

The following commit has been merged in the kubuntu_unstable branch:
commit 9e4a255166abf4d330a433c0a477e043861e78d2
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 20:40:39 2015 +0200

    tidy up merge
---
 debian/breeze.install            | 7 -------
 debian/kde-style-breeze.install  | 7 -------
 debian/kwin-style-breeze.install | 4 ----
 3 files changed, 18 deletions(-)

diff --git a/debian/breeze.install b/debian/breeze.install
index ac88a44..95c7339 100644
--- a/debian/breeze.install
+++ b/debian/breeze.install
@@ -1,13 +1,6 @@
-<<<<<<< HEAD
-=======
->>>>>>> master
 usr/bin/breeze-settings5
 usr/lib/*/kconf_update_bin
-usr/lib/*/kconf_update_bin/gtkbreeze
-usr/lib/*/kconf_update_bin/kde4breeze
 usr/share/icons/hicolor/*/apps/breeze-settings.*
 usr/share/icons/hicolor/scalable/apps/breeze-settings.svgz
 usr/share/kconf_update
-usr/share/kconf_update/gtkbreeze.upd
-usr/share/kconf_update/kde4breeze.upd
 usr/share/wallpapers/Next
diff --git a/debian/kde-style-breeze.install b/debian/kde-style-breeze.install
index 0bec91c..707f567 100644
--- a/debian/kde-style-breeze.install
+++ b/debian/kde-style-breeze.install
@@ -1,15 +1,8 @@
-<<<<<<< HEAD
-=======
->>>>>>> master
 usr/lib/*/qt5/plugins/kstyle_breeze_config.so
 usr/lib/*/qt5/plugins/styles/breeze.so
 usr/share/QtCurve
-usr/share/QtCurve/Breeze.qtcurve
 usr/share/color-schemes
-usr/share/color-schemes/Breeze.colors
-usr/share/color-schemes/BreezeDark.colors
 usr/share/kservices5/breezestyleconfig.desktop
 usr/share/kservices5/breezestyleconfig.desktop
 usr/share/kstyle
-usr/share/kstyle/themes/breeze.themerc
 usr/share/locale/*/*/breeze_style_config.mo
diff --git a/debian/kwin-style-breeze.install b/debian/kwin-style-breeze.install
index 710f992..78218b3 100644
--- a/debian/kwin-style-breeze.install
+++ b/debian/kwin-style-breeze.install
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-=======
->>>>>>> master
 usr/lib/*/qt5/plugins/org.kde.kdecoration2/breezedecoration.so
 usr/share/kservices5/breezedecorationconfig.desktop
-usr/share/kservices5/breezedecorationconfig.desktop
 usr/share/locale/*/*/breeze_kwin_deco.mo
 usr/share/locale/*/LC_MESSAGES/breeze_kwin_deco.mo

-- 
breeze packaging