telepathy-salut:edit

2015-11-23 15:09:51 +02:00
parent 6cba67e941
commit 57966fbdcb
1 changed files with 0 additions and 3 deletions
@@ -48,10 +48,7 @@
            <Dependency>telepathy-glib</Dependency>
        </RuntimeDependencies>
        <Files>
-<<<<<<< HEAD
-=======
            <Path fileType="executable">/usr/bin</Path>
->>>>>>> 5b858f0343b6bccaa3bb097ed11fe0a95cd4a98f
            <Path fileType="library">/usr/lib</Path>
            <Path fileType="data">/usr/share/dbus-1</Path>
            <Path fileType="data">/usr/share/telepathy</Path>