mirror of
https://github.com/QuasarApp/CopyrightFixer.git
synced 2025-05-09 16:09:56 +00:00
Merge branch 'task_49' of github.com:QuasarApp/CopyrightFixer into task_49
This commit is contained in:
commit
b3ff916953
@ -60,6 +60,10 @@ bool ConfigParser::parseOptions(Config &conf) const {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> ffc8cde82c8bb1d3a11bd32b7766e47cbe5e9f78
|
||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user