[SCM] frameworkintegration packaging branch, master, updated. debian/5.37.0-2-105-ge9c37f4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4dde588e47296afece5b56e2604b5de0b5fe63ed
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Dec 3 02:19:06 2015 +0100

    Fix merge marker
---
 debian/frameworkintegration.install | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/debian/frameworkintegration.install b/debian/frameworkintegration.install
index d664a2b..25f2f37 100644
--- a/debian/frameworkintegration.install
+++ b/debian/frameworkintegration.install
@@ -1,10 +1,6 @@
 usr/lib/*/qt5/plugins/kf5/FrameworkIntegrationPlugin.so
 usr/lib/*/qt5/plugins/platformthemes/KDEPlatformTheme.so
-<<<<<<< HEAD
 usr/share/kconf_update/
-=======
-usr/share/kconf_update/frameworksintegration-5.16-font.*
->>>>>>> master
 usr/share/kf5/infopage/
 usr/share/knotifications5/plasma_workspace.notifyrc
 usr/share/locale/*/*/frameworkintegration5.mo

-- 
frameworkintegration packaging