dbs.php

diff --git a/etc/dbs.php b/etc/dbs.php
index 173415b5a71601dd6e37b2ff3c29ac117b6ce3df..d0c2b2c4d08bb7c0891f6c138b3698a6a7af54da 100644 (file)
--- a/etc/dbs.php
+++ b/etc/dbs.php
@@ -98,9 +98,8 @@ foreach ($CONF as $id => $db) {
   conf_merge($CONF[$fname],$CONF['all']);
 
 }
+conf_merge($CONF['nb'],$CONF['all']);
 
-#conf_merge($CONF['owncloud'],$CONF['all']);
-#conf_merge($CONF['nb'],$CONF['all']);
 return 1;
 
 function conf_merge(&$c1,&$c2) {