Remove edit marks in requirements-nover
This commit is contained in:
parent
1666ac50fe
commit
8723fc4def
1 changed files with 0 additions and 4 deletions
|
@ -54,9 +54,5 @@ Flask-Testing
|
|||
pyjwt
|
||||
toposort
|
||||
pyjwkest
|
||||
<<<<<<< HEAD
|
||||
rfc3987
|
||||
jsonpath-rw
|
||||
=======
|
||||
jsonpath-rw
|
||||
>>>>>>> upstream/master
|
||||
|
|
Reference in a new issue