Update requirements.txt

somacdivad · somacdivad · commit 8201d46dda2b · 2020-09-22T16:02:02.000-05:00
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
-black==19.3b0
-flake8==3.7.7
-=======
 black==19.10b0
 flake8==3.8.2 
->>>>>>> master
