resolve conflict

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:

resources/www/admin/styles/main.scss

@@ -350,6 +350,7 @@ div.switch_right.unchecked {
   right: 40px;
   z-index: 1;
 }
+
 h2.subdefName {
   display: inline-block;
   margin-right: 1.5rem;
@@ -364,7 +365,7 @@ h2.subdefName {
   vertical-align: top;
 }
 
-.langTab h3{
+.langTab h3 {
   font-weight: 700;
   font-size: 13px;
   margin: 4px 0;
@@ -372,13 +373,14 @@ h2.subdefName {
   text-align: center;
 }
 
-.toggle{
+.toggle {
   display: block;
   margin: 15px 0;
   color: #08c;
   cursor: pointer;
 }
-.subdefTab input, .langTab input{
+
+.subdefTab input, .langTab input {
   margin: 0;
 }
 
@@ -387,6 +389,7 @@ label[for="elasticsearch_settings_highlight"] {
   margin-left: 0.5rem;
   margin-bottom: 1rem;
 }
+
 input[id="elasticsearch_settings_highlight"] {
   float: left;
 }
@@ -394,6 +397,7 @@ input[id="elasticsearch_settings_highlight"] {
 #downbutton {
   margin: 1rem 0;
 }
+
 #upbutton {
   width: 100%;
   text-align: left;
@@ -521,7 +525,7 @@ span.simplecolorpicker.picker {
 }
 
 @media screen and (max-width: 1150px) {
-  .langTab{
+  .langTab {
     display: block;
   }
 }