From ea02ed8cfcbb368b202b98c220465a9fcef4ca6a Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 6 Apr 2020 14:32:42 +0200 Subject: [PATCH] remove cloud conflickt file --- ...in (conflicted copy 2020-04-06 133915).cpp | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 src/main (conflicted copy 2020-04-06 133915).cpp diff --git a/src/main (conflicted copy 2020-04-06 133915).cpp b/src/main (conflicted copy 2020-04-06 133915).cpp deleted file mode 100644 index bb5e4dc..0000000 --- a/src/main (conflicted copy 2020-04-06 133915).cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "programManager.h" - -int main(int argc, char *argv[]) -{ - - std::cout << "test: ,.12-.*'§ und: " << PageManager::upper_string("abced<<,.12-.*'§") << std::endl; - - return 0; - - ProgramManager mainProgram; - Settings settings; - int res = manageParameter(settings, argc, argv); - if(res == -1) - return 0; - else if(res != 0) { - if(settings.debugMode) - std::cout << " => Error: Das Auswerten der Parameter ist fehlgeschlagen!" << std::endl; - return res; - } else { - return mainProgram.start(&settings); - } -}