merged

bareos · Apr 29, 2014 · f38db1d · f38db1d
2 parents 5f755a4 + 9a75819
commit f38db1d
Show file tree

Hide file tree

Showing 3 changed files with 1,064 additions and 1 deletion.
diff --git a/platforms/debian/set_dbconfig_vars.sh.in b/platforms/debian/set_dbconfig_vars.sh.in
@@ -16,6 +16,7 @@ else
     dbname=`get_database_name`
     dbuser=`get_database_user`
     dbpass=`get_database_password`
+<<<<<<< HEAD
     case "`get_database_driver || true`" in
         postgresql)
             dbtype="pgsql"
@@ -31,4 +32,6 @@ else
             dbtype="sqlite3"
             ;;
     esac
+=======
+>>>>>>> origin/playground
 fi