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

2025-05-08 15:39:45 +00:00 · 2021-05-08 10:57:31 +03:00 · 2021-05-08 10:57:31 +03:00 · b3ff916953
commit b3ff916953
parent a882e81c8d ffc8cde82c
1 changed files with 4 additions and 0 deletions
--- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp
+++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp
@ -60,6 +60,10 @@ bool ConfigParser::parseOptions(Config &conf) const {
        return false;
    }

+<<<<<<< HEAD
+=======
+
+>>>>>>> ffc8cde82c8bb1d3a11bd32b7766e47cbe5e9f78
    return true;
 };