Resolve merge conflicts for upstream merge
This commit is contained in:
@@ -13,11 +13,11 @@ define('PMA_MINIMUM_COMMON', true);
|
||||
/**
|
||||
* Gets core libraries and defines some variables
|
||||
*/
|
||||
require_once './libraries/common.inc.php';
|
||||
require './libraries/common.inc.php';
|
||||
/**
|
||||
* ZIP file handler.
|
||||
*/
|
||||
require_once './libraries/zip.lib.php';
|
||||
require './libraries/zip.lib.php';
|
||||
|
||||
// ini file
|
||||
$parameters = array(
|
||||
|
Reference in New Issue
Block a user