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_synchronize.php
+++ b/server_synchronize.php
@@ -14,7 +14,6 @@ require_once './libraries/common.inc.php';
 /**
 * Does the common work
 */
-$GLOBALS['js_include'][] = 'functions.js';
 $GLOBALS['js_include'][] = 'server_synchronize.js';
 require_once './libraries/server_common.inc.php';

@@ -1215,5 +1214,5 @@ if (isset($_REQUEST['synchronize_db'])) {
 /**
 * Displays the footer
 */
-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';
 ?>