merged

bareos · Apr 29, 2014 · 5af3cb5 · 5af3cb5
1 parent f38db1d
commit 5af3cb5
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/platforms/debian/set_dbconfig_vars.sh.in b/platforms/debian/set_dbconfig_vars.sh.in
@@ -16,7 +16,6 @@ else
     dbname=`get_database_name`
     dbuser=`get_database_user`
     dbpass=`get_database_password`
-<<<<<<< HEAD
     case "`get_database_driver || true`" in
         postgresql)
             dbtype="pgsql"
@@ -32,6 +31,4 @@ else
             dbtype="sqlite3"
             ;;
     esac
-=======
->>>>>>> origin/playground
 fi