6543/S_New4
1
0
Fork 0
forked from markus/S_New4
Code Issues Pull Requests Releases Wiki Activity

remove cloud conflickt file

Browse Source
This commit is contained in:
Markus 2020-04-06 14:32:42 +02:00
parent a4e86c3250
commit ea02ed8cfc
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main (conflicted copy 2020-04-06 133915).cpp
View File

@ -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);
}
}