Merge branch 'master' of ssh://drop.maemo.org/git/vicar

[vicar] / qtc_packaging / debian_harmattan / vicar.aegis

diff --git a/qtc_packaging/debian_harmattan/vicar.aegis b/qtc_packaging/debian_harmattan/vicar.aegis
index 4c310f9..4062f81 100644 (file)
--- 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">