diff --git a/tox.ini b/tox.ini
index 8ab419a..f938545 100644
--- 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))