From ff48aa559fc0e6b562162aca696b8269e1442c00 Mon Sep 17 00:00:00 2001 From: Jirayut 'Dear' Nimsaeng Date: Thu, 7 Jul 2016 14:10:19 +0700 Subject: [PATCH] Remove resolved conflict text --- create_db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/create_db.py b/create_db.py index 40df924..ec8eb60 100755 --- a/create_db.py +++ b/create_db.py @@ -1,4 +1,5 @@ #!flask/bin/python + from migrate.versioning import api from config import SQLALCHEMY_DATABASE_URI from config import SQLALCHEMY_MIGRATE_REPO @@ -91,4 +92,3 @@ def commit_version_control(db_commit): if __name__ == '__main__': start() ->>>>>>> docker