From 59281db9cbe0f979a7cdcd12d064ff7acb543c0e Mon Sep 17 00:00:00 2001 From: viveksantayana Date: Sat, 11 Jun 2022 15:39:53 +0100 Subject: [PATCH] merged --- ref-test/app/install.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ref-test/app/install.py b/ref-test/app/install.py index 31f9ee0..2ea9759 100644 --- a/ref-test/app/install.py +++ b/ref-test/app/install.py @@ -22,13 +22,8 @@ def install_scripts(): if not database_exists(Config.SQLALCHEMY_DATABASE_URI): create_database(Config.SQLALCHEMY_DATABASE_URI) write('system.log', 'No database found. Creating a new database.') -<<<<<<< HEAD with app.app_context(): db.create_all() write('system.log', 'Creating database schema.') -======= - with app.app_context(): db.create_all() - write('system.log', 'Creating database schema.') ->>>>>>> dd8685b1039a6bdcbe1df0b07c2ef5d72399c876 if not path.isfile(f'./{data}/.encryption.key'): write('system.log', 'No encryption key found. Generating new encryption key.') with open(f'./{data}/.encryption.key', 'wb') as key_file: