Added missing files to pro file

diff --git a/Client/UI.pro b/Client/UI.pro
index 134e417..9c2ac9b 100644 (file)
--- a/Client/UI.pro
+++ b/Client/UI.pro
@@ -28,7 +28,6 @@ SOURCES += main.cpp \
     maemo5locationprivate.cpp \
     maemo5location.cpp \
     routedialog.cpp
-
 HEADERS += carmainwindow.h \
     resultdialog.h \
     stringlistmodel.h \
@@ -47,7 +46,6 @@ HEADERS += carmainwindow.h \
     maemo5locationprivate.h \
     maemo5location.h \
     routedialog.h
-
 FORMS += carmainwindow.ui \
     resultdialog.ui \
     measuredialog.ui \
@@ -55,6 +53,7 @@ FORMS += carmainwindow.ui \
     registration.ui \
     welcomedialog.ui \
     routedialog.ui
+<<<<<<< HEAD:Client/UI.pro
 
 contains(QT_CONFIG, hildon):CONFIG += hildon
 CONFIG += link_pkgconfig