telepathy-salut:edit
This commit is contained in:
@@ -48,10 +48,7 @@
|
|||||||
<Dependency>telepathy-glib</Dependency>
|
<Dependency>telepathy-glib</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
<Path fileType="executable">/usr/bin</Path>
|
<Path fileType="executable">/usr/bin</Path>
|
||||||
>>>>>>> 5b858f0343b6bccaa3bb097ed11fe0a95cd4a98f
|
|
||||||
<Path fileType="library">/usr/lib</Path>
|
<Path fileType="library">/usr/lib</Path>
|
||||||
<Path fileType="data">/usr/share/dbus-1</Path>
|
<Path fileType="data">/usr/share/dbus-1</Path>
|
||||||
<Path fileType="data">/usr/share/telepathy</Path>
|
<Path fileType="data">/usr/share/telepathy</Path>
|
||||||
|
|||||||
Reference in New Issue
Block a user