tox.ini: remove diff line added from ##58764 (#59785)

2021-12-16 11:30:55 +01:00 · 2021-12-16 11:30:55 +01:00 · 1cede90acc
parent 713e31d0b7
commit 1cede90acc
1 changed files with 0 additions and 1 deletions
--- a/tox.ini
+++ b/tox.ini
@ -186,4 +186,3 @@ max-parents=7
 max-attributes=7
 min-public-methods=0
 max-public-methods=50
->>>>>>> 489da9b (tox.ini: separate pylint target and run it with jenkins only (#58764))