Skip to content

Commit

Permalink
Fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@mistercrunch
mistercrunch committed Feb 5, 2018
1 parent c9feccc commit 3ab1ab3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def get_git_sha():
'flask-cache==0.13.1',
'flask-migrate==2.1.1',
'flask-script==2.0.6',
'flask-sqlalchemy==2.3.2',
'flask-sqlalchemy==2.1',
'flask-testing==0.7.1',
'flask-wtf==0.14.2',
'flower==0.9.2',
Expand Down

1 comment on commit 3ab1ab3

@xrmx
Copy link
Contributor

@xrmx xrmx commented on 3ab1ab3 Feb 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, bugged with this when i bumped sqlalchemy :) Do you think this can be resolved in flask-appbuilder? I have to say that i don't understand the background on why we need to subclass flask_sqlalchemy.SQLAlchemy.

Please sign in to comment.