Fixed Merge issues

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

diff --git a/src/vicar-lib/vicar-lib.pro b/src/vicar-lib/vicar-lib.pro
index f473289..d799730 100755 (executable)
--- a/src/vicar-lib/vicar-lib.pro
+++ b/src/vicar-lib/vicar-lib.pro
@@ -19,10 +19,6 @@ OBJECTS_DIR = cpp/.objs
 DESTDIR = ../lib
 
 SOURCES += cpp/dbusutility.cpp \
-<<<<<<< HEAD
-=======
-    cpp/gconfutility.cpp \
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
     cpp/telepathyutility.cpp \
     cpp/accountmanagerproxy.cpp \
     cpp/accountproxy.cpp \
@@ -32,10 +28,6 @@ SOURCES += cpp/dbusutility.cpp \
     cpp/databaseutility.cpp \
     cpp/harmattanaccountutility.cpp
 HEADERS += cpp/dbusutility.h \
-<<<<<<< HEAD
-=======
-    cpp/gconfutility.h \
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
     cpp/telepathyutility.h \
     cpp/accountmanagerproxy.h \
     cpp/accountproxy.h \