Remove resolved conflict text
This commit is contained in:
parent
1a6555403c
commit
ff48aa559f
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue