Added fuction for checking username registration on the server.

author Tiina Kivilinna-Korhola <tiina.kivilinna-korhola@fudeco.com>

Wed, 17 Mar 2010 09:32:56 +0000 (11:32 +0200)

committer Toni Jussila <toni.jussila@fudeco.com>

Wed, 17 Mar 2010 10:07:54 +0000 (12:07 +0200)
author Tiina Kivilinna-Korhola <tiina.kivilinna-korhola@fudeco.com>
Wed, 17 Mar 2010 09:32:56 +0000 (11:32 +0200)
committer Toni Jussila <toni.jussila@fudeco.com>
Wed, 17 Mar 2010 10:07:54 +0000 (12:07 +0200)
diff --git a/Client/UI.pro b/Client/UI.pro

index 9c2ac9b..d11e0d4 100644 (file)
--- a/Client/UI.pro
+++ b/Client/UI.pro
@@ -53,7 +53,6 @@ FORMS += carmainwindow.ui \
      registration.ui \
      welcomedialog.ui \
      routedialog.ui
-<<<<<<< HEAD:Client/UI.pro
  
  contains(QT_CONFIG, hildon):CONFIG += hildon
  CONFIG += link_pkgconfig
author	Tiina Kivilinna-Korhola <tiina.kivilinna-korhola@fudeco.com>
	Wed, 17 Mar 2010 09:32:56 +0000 (11:32 +0200)
committer	Toni Jussila <toni.jussila@fudeco.com>
	Wed, 17 Mar 2010 10:07:54 +0000 (12:07 +0200)