Remove edit marks in requirements-nover

This commit is contained in:
Jake Moshenko 2015-11-03 11:18:57 -05:00
parent 1666ac50fe
commit 8723fc4def

View file

@ -54,9 +54,5 @@ Flask-Testing
pyjwt pyjwt
toposort toposort
pyjwkest pyjwkest
<<<<<<< HEAD
rfc3987 rfc3987
jsonpath-rw jsonpath-rw
=======
jsonpath-rw
>>>>>>> upstream/master