DESTDIR = ../lib
SOURCES += cpp/dbusutility.cpp \
+<<<<<<< HEAD
+=======
+ cpp/gconfutility.cpp \
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
cpp/telepathyutility.cpp \
cpp/accountmanagerproxy.cpp \
cpp/accountproxy.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 \