Resolve merge conflicts for upstream merge

This commit is contained in:
ninadsp
2010-07-29 19:17:25 +05:30
175 changed files with 76587 additions and 70379 deletions

View File

@@ -15,11 +15,6 @@ if (!defined('PHPMYADMIN')) {
exit;
}
/**
* Load paths.
*/
require_once('./libraries/vendor_config.php');
$cfg_db = array();
// path to config file, relative to phpMyAdmin's root path