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

[vicar] / src / vicar-daemon / vicar-daemon.pro

diff --git a/src/vicar-daemon/vicar-daemon.pro b/src/vicar-daemon/vicar-daemon.pro
index f7134d9..9ac1d4a 100755 (executable)
--- a/src/vicar-daemon/vicar-daemon.pro
+++ b/src/vicar-daemon/vicar-daemon.pro
@@ -16,11 +16,21 @@ QT += dbus sql
 QT -= gui
 TEMPLATE = app
 TARGET = vicar-daemon
+<<<<<<< HEAD
 
 VPATH += cpp
 MOC_DIR = cpp/.mocs
 OBJECTS_DIR = cpp/.objs
 
+=======
+CONFIG += console
+CONFIG -= app_bundle
+
+VPATH += cpp
+MOC_DIR = cpp/.mocs
+OBJECTS_DIR = cpp/.objs
+
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 SOURCES += cpp/main.cpp \
     cpp/callrouter.cpp \
     cpp/vicardbusadaptor.cpp