Added resultdialog back to UI.pro.

[speedfreak] / Client / carmainwindow.cpp

diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp
index 5b1e1f4..1e3b7c7 100644 (file)
--- a/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@ -424,14 +424,12 @@ void CarMainWindow::regUserToServer()
     myHttpClient->requestRegistration();
 }
 
-<<<<<<< HEAD:Client/carmainwindow.cpp
+
 void CarMainWindow::on_drawRoutePushButton_clicked()
 {
     myRoute->show();
 }
 
-=======
->>>>>>> Added fuction for checking username registration on the server.:Client/carmainwindow.cpp
 void CarMainWindow::userLogin()
 {
     myHttpClient->checkLogin();