Added isort to setup, makefile and tox

ethereum · Apr 23, 2023 · e468927 · e468927
1 parent 4050d2f
commit e468927
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/setup.py b/setup.py
@@ -47,7 +47,11 @@
         "pydocstyle>=6.0.0",
         "types-setuptools",
         "importlib-metadata<5.0;python_version<'3.8'",
+<<<<<<< HEAD
         "isort==5.11.4"
+=======
+        "isort==5.12.0"
+>>>>>>> 9c18873f (Added isort to setup, makefile and tox)
     ],
     'benchmark': [
         "termcolor>=1.1.0,<2.0.0",