fix(requirements): corrected syntax

alshapton · Jan 2, 2020 · baeeaf5 · baeeaf5
1 parent 801f001
commit baeeaf5
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -2,9 +2,5 @@ cachepy==1.1
 beautifulsoup4==4.8.2
 tinydb==3.15.2
 requests==2.22.0
-<<<<<<< HEAD
-setuptools==42.0.2
-=======
 setuptools==43.0.0
->>>>>>> 5ae747452c3b10f27f4d349aff1a70fd1a75d44a
-sphinx_rtd_theme==0.4.3
+sphinx_rtd_theme==0.4.3