finish merge

1 files changed, 0 insertions, 7 deletions

diff --git a/client/main.cpp b/client/main.cpp
index 0a1c4e4..267248c 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -14,19 +14,12 @@
 #include "mainwindow.h"
 #include "main.h"
 #include "ui_mainwindow.h"
-#include "mytcpsocket.h"
-#include "timetest.h"
-#include "csv_import.h"
-#include <QDebug>
 
 QSqlDatabase dbRef = QSqlDatabase();
 
 int main(int argc, char *argv[])
 {
 	QApplication a(argc, argv);
-	TimeTest time;
-	MyTcpSocket s;
-	// s.doConnect();
     MainWindow w;
 
     dbRef = QSqlDatabase::addDatabase("QMYSQL");