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

diff --git a/src/vicar-daemon/vicar-daemon.pro b/src/vicar-daemon/vicar-daemon.pro
index 9ac1d4a..f7134d9 100755
--- a/src/vicar-daemon/vicar-daemon.pro
+++ b/src/vicar-daemon/vicar-daemon.pro
@@ -16,21 +16,11 @@ 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