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/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -9,11 +9,6 @@ if (! defined('PHPMYADMIN')) {
    exit;
 }

-/**
- *
- */
-require_once './libraries/Table.class.php';
-
 /**
 * Executes a query as controluser if possible, otherwise as normal user
 *