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

-/**
- * Load vendor config.
- */
-require_once('./libraries/vendor_config.php');
-
 /**
 * Initializes message list
 */