merge

2020-01-07 22:13:42 +01:00 · 2020-01-07 22:13:42 +01:00 · 52c612c33e
commit 52c612c33e
parent 37965fbfcf db15ccff76
1 changed files with 4 additions and 0 deletions
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@ -16,6 +16,10 @@ 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