diff options
| author | Maximiliano Curia <maxy@gnuservers.com.ar> | 2015-02-16 11:07:19 +0100 |
|---|---|---|
| committer | Maximiliano Curia <maxy@gnuservers.com.ar> | 2015-02-16 11:07:19 +0100 |
| commit | c682cc640a10336ec442b5f76a02576a6b721146 (patch) | |
| tree | fd25005b48f25a9b06d2b52ba7b000c8a12a0cf1 | |
| parent | de9ea324bce2ff0e3e470d424bb70be546011376 (diff) | |
| download | kde4libs-c682cc640a10336ec442b5f76a02576a6b721146.tar.gz | |
Badly merged file
| -rw-r--r-- | debian/kdelibs5-dev.install | 6 |
1 files changed, 0 insertions, 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 |