varia/xppl
14
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

fixed conflixt in pip requirements.txt

Browse Source
This commit is contained in:
Jocavdh 2018-06-13 13:57:25 +02:00
parent dfe9c9348d
commit 475ec71740
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
requirements.txt
View File

@ -16,12 +16,8 @@ WTForms==2.1
flask-marshmallow==0.9.0 flask-marshmallow==0.9.0
Wand==0.4.4 Wand==0.4.4
PyPDF2==1.26.0 PyPDF2==1.26.0
<<<<<<< HEAD
flask-socketio==2.9.2 flask-socketio==2.9.2
flask-whooshalchemyplus==0.7.5 flask-whooshalchemyplus==0.7.5
python-dotenv==0.7.1 python-dotenv==0.7.1
=======
autocomplete==0.0.104 autocomplete==0.0.104
>>>>>>> 30d8bade54d8646ad4a5e314022d62e2dbf81755