Merge branch 'main' of github.com:MoWeeeZ/tool-default-configs

This commit is contained in:
Moritz Gmeiner 2024-02-26 17:09:08 +01:00
commit 48eaf14498

View file

@ -11,6 +11,7 @@ Checks: '
performance-*, performance-*,
readability-*, readability-*,
<<<<<<< HEAD
-bugprone-easily-swappable-parameters, -bugprone-easily-swappable-parameters,
-cppcoreguidelines-avoid-magic-numbers, -cppcoreguidelines-avoid-magic-numbers,
@ -18,6 +19,10 @@ Checks: '
-google-objc-function-naming, -google-objc-function-naming,
-google-readability-todo, -google-readability-todo,
||||||| e0a9d73
=======
-cppcoreguidelines-avoid-magic-numbers,
>>>>>>> f1af0a699020eeef4d24ac8186e577752169e2c6
-misc-no-recursion, -misc-no-recursion,
-modernize-use-nodiscard, -modernize-use-nodiscard,