X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=qtc_packaging%2Fdebian_harmattan%2Fvicar.aegis;h=4062f810fe299fd8087d1665f589d034b58c1cad;hb=2beca638f4ba146e25320c9c07cc1f29d0b2bba2;hp=4c310f9102cf61b89c1f152d6f86b30f9f742f10;hpb=2b82f07726d657dff4ad091f056b8685d5ba9930;p=vicar

diff --git a/qtc_packaging/debian_harmattan/vicar.aegis b/qtc_packaging/debian_harmattan/vicar.aegis
index 4c310f9..4062f81 100644
--- a/qtc_packaging/debian_harmattan/vicar.aegis
+++ b/qtc_packaging/debian_harmattan/vicar.aegis
@@ -8,7 +8,11 @@
      Modify the file or remove the checksum to disable this functionality. -->
 <aegis>
 
+<<<<<<< HEAD
 	 <!--provide>
+=======
+	 <!-- provide>
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 	    <dbus name="org.freedesktop.Telepathy.Connection.vicar.tel.vicar" own="Cellular" bus="session">
 		<node name="/">
 			<interface name="org.freedesktop.Telepathy.Connection">
@@ -43,6 +47,13 @@
 		<for path="/opt/vicar/bin/vicar-telepathy" />
 		<for path="/opt/vicar/bin/vicar-daemon" />
 		<for path="/opt/vicar/bin/vicar-utils" />
+<<<<<<< HEAD
+=======
+		<!-- These entries to be used only when debug package is included
+		<for path="/usr/lib/debug/opt/vicar/bin/vicar-telepathy" />
+		<for path="/usr/lib/debug/opt/vicar/bin/vicar-daemon" />
+		<for path="/usr/lib/debug/opt/vicar/bin/vicar-utils" /> -->
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 	</request>
 
 	<request context="INSTALL">