From: Olavi Pulkkinen <olavi.pulkkinen@fudeco.com>
Date: Wed, 17 Mar 2010 08:35:09 +0000 (+0200)
Subject: Added missing files to  pro file
X-Git-Tag: v0.1~43
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=b9683feb120184b53d54f432b93166bef66c0a60;p=speedfreak

Added missing files to  pro file
---

diff --git a/Client/UI.pro b/Client/UI.pro
index 134e417..9c2ac9b 100644
--- 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