From c682cc640a10336ec442b5f76a02576a6b721146 Mon Sep 17 00:00:00 2001 From: Maximiliano Curia Date: Mon, 16 Feb 2015 11:07:19 +0100 Subject: Badly merged file --- debian/kdelibs5-dev.install | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/kdelibs5-dev.install b/debian/kdelibs5-dev.install index a262c13..9015911 100644 --- a/debian/kdelibs5-dev.install +++ b/debian/kdelibs5-dev.install @@ -1890,12 +1890,6 @@ usr/lib/libktexteditor.so usr/lib/libkunitconversion.so usr/lib/libkunittest.so usr/lib/libkutils.so -<<<<<<< HEAD -======= -usr/lib/libnepomuk.so -usr/lib/libnepomukquery.so -usr/lib/libnepomukutils.so ->>>>>>> old/master usr/lib/libplasma.so usr/lib/libsolid.so usr/lib/libthreadweaver.so -- cgit v1.2.3