diff options
| author | ninadsp <ninadsp16289@gmail.com> | 2010-07-29 17:47:25 +0400 |
|---|---|---|
| committer | ninadsp <ninadsp16289@gmail.com> | 2010-07-29 17:47:25 +0400 |
| commit | a2f78a6d38f74f0cc62f2a5837e682901331c21e (patch) | |
| tree | ceab0c3ae4efe05fe345f270bdf4d236d24ef63d /chk_rel.php | |
| parent | 2bec345a46d11293b93c2b06bf8009c913cde8fb (diff) | |
| parent | d0fc397fe1c474150883e85a791a012a7ae03380 (diff) | |
Resolve merge conflicts for upstream merge
Diffstat (limited to 'chk_rel.php')
| -rwxr-xr-x | chk_rel.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chk_rel.php b/chk_rel.php index 38ca5c1b05..8955350b0f 100755 --- a/chk_rel.php +++ b/chk_rel.php @@ -9,9 +9,7 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; -require_once './libraries/relation.lib.php'; /** @@ -23,5 +21,5 @@ $cfgRelation = PMA_getRelationsParam(TRUE); /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> |