fixing conflict
This commit is contained in:
parent
fed37c9dc0
commit
2c88e4e3ba
|
@ -14,7 +14,7 @@ Flask-Principal==0.4.0
|
||||||
Flask-Mail==0.9.1
|
Flask-Mail==0.9.1
|
||||||
SQLAlchemy-Utils==0.31.3
|
SQLAlchemy-Utils==0.31.3
|
||||||
BeautifulSoup4
|
BeautifulSoup4
|
||||||
requests==2.8.0
|
requests==2.8.1
|
||||||
psycopg2==2.6.1
|
psycopg2==2.6.1
|
||||||
arrow==0.7.0
|
arrow==0.7.0
|
||||||
boto==2.38.0 # we might make this optional
|
boto==2.38.0 # we might make this optional
|
||||||
|
|
Loading…
Reference in New Issue