remove head
This commit is contained in:
parent
61d9c4bee1
commit
14321e6ce6
|
@ -31,10 +31,6 @@ sys.stderr.flush()
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
app.config.from_object("forest.config.Config")
|
app.config.from_object("forest.config.Config")
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> 830f996d6068222f74a4460d104568313b8d4434
|
|
||||||
db = SQLAlchemy(app)
|
db = SQLAlchemy(app)
|
||||||
#db = SQLAlchemy(session_options = { "autoflush": False })
|
#db = SQLAlchemy(session_options = { "autoflush": False })
|
||||||
db.init_app(app)
|
db.init_app(app)
|
||||||
|
|
Loading…
Reference in a new issue