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/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -74,7 +74,6 @@ if (isset($submitcollation) && !empty($db_collation)) {
    };
 }

-$GLOBALS['js_include'][] = 'functions.js';
 require_once './libraries/header.inc.php';

 /**