From e468927020743b2f2abcc04094fb212783368692 Mon Sep 17 00:00:00 2001
From: Prathmesh Ranaut <aayush.ranaut@gmail.com>
Date: Thu, 20 Apr 2023 01:01:03 +0530
Subject: [PATCH] Added isort to setup, makefile and tox

---
 setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup.py b/setup.py
index f8db49f85..7a5bfc0ef 100644
--- 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",