From 1cede90acc596f6163f09631cef069d3dfa0f861 Mon Sep 17 00:00:00 2001
From: Nicolas ROCHE <nroche@entrouvert.com>
Date: Thu, 16 Dec 2021 11:30:55 +0100
Subject: [PATCH] tox.ini: remove diff line added from ##58764 (#59785)

---
 tox.ini | 1 -
 1 file changed, 1 deletion(-)

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))