Fix requirements.txt

Fixed bad merge in order to be able to install from source
2 years ago · 18fbbfa0fc
parent f4a5b67ceb
commit 18fbbfa0fc
1 changed files with 0 additions and 12 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -1,17 +1,6 @@
-<<<<<<< HEAD
-arrow==0.9.0
 decorator==4.0.10
-praw==4.2.0
-PyYAML==3.12
-requests==2.12.1
-six==1.10.0
-backports-abc==0.4
-tornado==4.3
-update-checker==0.15
 wheel==0.24.0
 appdirs==1.4.3
-=======
-appdirs==1.4.3
 arrow==0.10.0
 backports-abc==0.5
 certifi==2017.4.17
@ -27,4 +16,3 @@ six==1.10.0
 tornado==4.5.1
 update-checker==0.16
 urllib3==1.21.1
->>>>>>> 772df35c68a6782b2bd733801458023545977166