deblan/PowerDNS-Admin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove resolved conflict text

Browse source
This commit is contained in:
Jirayut 'Dear' Nimsaeng 2016-07-07 14:10:19 +07:00
parent 1a6555403c
commit ff48aa559f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
create_db.py
View file

@ -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