[pip] Resolved Merge Conflict Left Behind

verilog-to-routing · Jun 10, 2024 · 09a92dd · 09a92dd
1 parent c310854
commit 09a92dd
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -4,12 +4,8 @@ psutil
 
 # Python linter and formatter
 click==8.0.2 # Our version of black needs an older version of click (https://stackoverflow.com/questions/71673404/importerror-cannot-import-name-unicodefun-from-click)
-<<<<<<< dependabot/pip/black-24.3.0
 black==24.3.0
-=======
-black==21.4b0
->>>>>>> master
 pylint==2.7.4
 
 # Surelog
-orderedmultidict
+orderedmultidict