Merge branch 'task_49' of github.com:QuasarApp/CopyrightFixer into task_49

This commit is contained in:
IgorekLoschinin 2021-05-08 10:57:31 +03:00
commit b3ff916953

View File

@ -60,6 +60,10 @@ bool ConfigParser::parseOptions(Config &conf) const {
return false; return false;
} }
<<<<<<< HEAD
=======
>>>>>>> ffc8cde82c8bb1d3a11bd32b7766e47cbe5e9f78
return true; return true;
}; };