merge
This commit is contained in:
parent
52c612c33e
commit
c83639a47f
@ -16,10 +16,6 @@ pylint==2.3.1
|
||||
six==1.12.0
|
||||
soupsieve==1.9.1
|
||||
typed-ast==1.4.0
|
||||
<<<<<<< HEAD
|
||||
Werkzeug==0.16.0
|
||||
=======
|
||||
Werkzeug==0.15.2
|
||||
>>>>>>> db15ccff764e95704cb9be68ecbdbad36f97ac5c
|
||||
wrapt==1.11.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user