mirror of
https://github.com/kemko/PowerDNS-Admin.git
synced 2026-01-01 15:45:45 +03:00
Remove resolved conflict text
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user