stashing requirements.txt changes

adonese · Apr 12, 2020 · 89e6003 · 89e6003
1 parent 38d46fb
commit 89e6003
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -2,10 +2,6 @@ alembic==1.3.2
 appdirs==1.4.3
 astroid==2.3.3
 attrs==19.3.0
-<<<<<<< HEAD
-=======
-black==19.10b0
->>>>>>> 8e24edb24822ec2f33c0c7e62672540febf50550
 certifi==2019.11.28
 chardet==3.0.4
 Click==7.0
@@ -31,10 +27,6 @@ mccabe==0.6.1
 more-itertools==8.1.0
 packaging==20.0
 pathspec==0.7.0
-<<<<<<< HEAD
-=======
-pkg-resources==0.0.0
->>>>>>> 8e24edb24822ec2f33c0c7e62672540febf50550
 pluggy==0.13.1
 py==1.8.1
 pylint==2.4.4