diff options
| -rw-r--r-- | src/client/clientapp/clientapp.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp index def9bb0..ce0b5f3 100644 --- a/src/client/clientapp/clientapp.cpp +++ b/src/client/clientapp/clientapp.cpp @@ -1,10 +1,6 @@ #include "clientapp.h" -<<<<<<< HEAD ClientApp::ClientApp(int& argc, char** argv) : QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false) { -======= -ClientApp::ClientApp(int& argc, char** argv) : QApplication(argc, argv), _connectionMode(ConnectionMode::None) { ->>>>>>> 024212d9ebcb9bba74ceb4d318b60d9dbf3b5a42 /* some values */ setOrganizationName("openslx"); setOrganizationDomain("openslx.org"); @@ -36,10 +32,6 @@ ClientApp::ClientApp(int& argc, char** argv) : QApplication(argc, argv), _connec void ClientApp::parseParameters() { for (QString a : arguments()) { if (a == "--exam-mode") { -<<<<<<< HEAD - qDebug() << "setting exam-mode to true"; -======= ->>>>>>> 024212d9ebcb9bba74ceb4d318b60d9dbf3b5a42 _examMode = true; } else if (a == "--auto") { _connectionMode = ConnectionMode::Auto; |