[SCM] kio-extras packaging branch, kubuntu_stable, updated. 77e2fe61062f4a2bed597ed148a466570558f8f1

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kio-extras.git;a=commitdiff;h=77e2fe6

The following commit has been merged in the kubuntu_stable branch:
commit 77e2fe61062f4a2bed597ed148a466570558f8f1
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 21:10:44 2015 +0200

    fix merge
---
 debian/kio-extras.install | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/debian/kio-extras.install b/debian/kio-extras.install
index d5438c0..7b4a6e9 100644
--- a/debian/kio-extras.install
+++ b/debian/kio-extras.install
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
->>>>>>> master
-usr/lib/*/libmolletnetwork5.so.*
 usr/lib/*/libmolletnetwork5.so.5
 usr/lib/*/libmolletnetwork5.so.5.*
 usr/lib/*/qt5

-- 
kio-extras packaging