altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Cleared up an unresolved merge conflict.

Browse source 
- Legacy-Id: 14698
This commit is contained in:
Henrik Levkowetz 2018-02-25 21:30:40 +00:00
parent 6e1d4d45d8
commit 37c9fbd28e
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

@ -4,11 +4,7 @@ setuptools>=18.5 # Require this first, to prevent later errors
anora>=0.1.2 anora>=0.1.2
argon2-cffi>=16.1.0 # For the Argon2 password hasher option argon2-cffi>=16.1.0 # For the Argon2 password hasher option
beautifulsoup4>=4.4 beautifulsoup4>=4.4
<<<<<<< .working
bibtexparser>=0.6.2,<1.0 # Version 1.0 doesn't work under python 2.7. 1.0.1 doesn't recognize month names or abbreviations. bibtexparser>=0.6.2,<1.0 # Version 1.0 doesn't work under python 2.7. 1.0.1 doesn't recognize month names or abbreviations.
=======
bibtexparser>=0.6.2,<1.0
>>>>>>> .merge-right.r14694
bleach>=1.5.0,<2.0.0 bleach>=1.5.0,<2.0.0
coverage>=4.0.1,!=4.0.2 coverage>=4.0.1,!=4.0.2
#cssselect>=0.6.1 # for PyQuery #cssselect>=0.6.1 # for PyQuery