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/navigation.php
+++ b/navigation.php
@@ -110,9 +110,8 @@ if ($GLOBALS['server'] && ! strlen($GLOBALS['db'])) {
 $db_start = $GLOBALS['db'];

 /**
- * the relation library
+ * the relation settings
 */
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();

 /**