mirror of https://github.com/x89/Shreddit
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
491 B
31 lines
491 B
<<<<<<< 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
|
|
chardet==3.0.4
|
|
idna==2.5
|
|
praw==5.0.0
|
|
prawcore==0.11.0
|
|
python-dateutil==2.6.0
|
|
PyYAML==3.12
|
|
requests==2.18.1
|
|
shreddit==6.0.7
|
|
six==1.10.0
|
|
tornado==4.5.1
|
|
update-checker==0.16
|
|
urllib3==1.21.1
|
|
>>>>>>> 772df35c68a6782b2bd733801458023545977166
|