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: