Fix merge conflict

This commit is contained in:
Sebastian Englbrecht 2022-11-17 20:02:07 +01:00
commit daee7c52e8

View File

@ -1,2 +1,2 @@
pylint == 2.13.* pylint == 2.15.*
black == 22.10.* black == 22.10.*