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

[vicar] / qtc_packaging / debian_harmattan / vicar.substvars

diff --git a/qtc_packaging/debian_harmattan/vicar.substvars b/qtc_packaging/debian_harmattan/vicar.substvars
index 218df44..d264d1f 100644 (file)
--- a/qtc_packaging/debian_harmattan/vicar.substvars
+++ b/qtc_packaging/debian_harmattan/vicar.substvars
@@ -1,2 +1,5 @@
+<<<<<<< HEAD
 shlibs:Depends=applauncherd-launcher, libaccounts-qt1, libc6 (>= 2.4), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2 (>= 0.71), libgcc1 (>= 1:4.1.1), libgconf2-6 (>= 2.13.5), libglib2.0-0 (>= 2.12.0), libqt4-dbus (>= 4.7.4~git20110517), libqt4-declarative (>= 4.7.4~git20110517), libqt4-sql (>= 4.7.4~git20110517), libqt4-xml (>= 4.7.4~git20110517), libqtcore4 (>= 4.7.4~git20110517), libqtgui4 (>= 4.7.4~git20110517), libstdc++6 (>= 4.4.0)
+=======
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 misc:Depends=