X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=inline;f=src%2Fvicar-daemon%2Fvicar-daemon.pro;fp=src%2Fvicar-daemon%2Fvicar-daemon.pro;h=9ac1d4a1393f6ecf56a921cf871876b4b29e28f6;hb=2beca638f4ba146e25320c9c07cc1f29d0b2bba2;hp=f7134d947f36d032f50411a64bb31ae9c3426288;hpb=2b82f07726d657dff4ad091f056b8685d5ba9930;p=vicar

diff --git a/src/vicar-daemon/vicar-daemon.pro b/src/vicar-daemon/vicar-daemon.pro
index f7134d9..9ac1d4a 100755
--- 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