[pip] Resolved Merge Conflict Left Behind

Author: AlexandreSinger

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