resolve conflict

2025-10-23 09:53:15 +00:00 · 2018-01-08 15:57:13 +04:00
parent bddc3781ba
commit 30f49bdd35
27 changed files with 564 additions and 467 deletions
--- a/resources/ansible/roles/app/templates/configuration.tpl
+++ b/resources/ansible/roles/app/templates/configuration.tpl
@@ -12,7 +12,7 @@ main:
        port: 3306
        user: '{{ mariadb.user }}'
        password: '{{ mariadb.password }}'
-        dbname: '{{ mariadb.appbox_db }}'
+dbname: '{{ mariadb.appbox_db }}'
        driver: pdo_mysql
        charset: UTF8
    database-test: