Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30
parent 2bec345a46 d0fc397fe1
commit a2f78a6d38
175 changed files with 76587 additions and 70379 deletions
--- a/server_databases.php
+++ b/server_databases.php
@@ -10,8 +10,6 @@
 */
 require_once './libraries/common.inc.php';

-
-$GLOBALS['js_include'][] = 'functions.js';
 require './libraries/server_common.inc.php';
 require './libraries/replication.inc.php';

@@ -384,6 +382,6 @@ if ($cfg['ShowCreateDb']) {
 /**
 * Sends the footer
 */
-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';

 ?>