unpin flask in requirements.in

2018-03-20 15:43:25 -07:00 · 2018-03-20 15:43:25 -07:00 · de7a5a30d1
commit de7a5a30d1
parent 40c35dc77b
1 changed files with 1 additions and 0 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -4,6 +4,7 @@
 #
 #    pip-compile --output-file requirements.txt requirements.in
 #
+<<<<<<< HEAD
 acme==0.22.2
 alembic-autogenerate-enums==0.0.2
 alembic==0.9.8            # via flask-migrate