telepathy-salut:edit

2015-11-23 15:09:22 +02:00
parent 175014a46b 5b858f0343
commit 6cba67e941
13 changed files with 86056 additions and 85507 deletions
@@ -48,6 +48,10 @@
            <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>
@@ -86,4 +90,4 @@
            <Email>osman.erkan@pisilinux.org</Email>
        </Update>
    </History>
-</PISI>
+</PISI>