X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fvicar-lib%2Fvicar-lib.pro;h=d7997306d033da508c4294535cb0170f312f6e01;hb=a39e35febe1d76a81b5c4ac452ac64309d1bc622;hp=f47328957019fa8cfb847ab018033df50250cea1;hpb=2beca638f4ba146e25320c9c07cc1f29d0b2bba2;p=vicar

diff --git a/src/vicar-lib/vicar-lib.pro b/src/vicar-lib/vicar-lib.pro
index f473289..d799730 100755
--- 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 \