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 /view_operations.php | |
parent | 2bec345a46d11293b93c2b06bf8009c913cde8fb (diff) | |
parent | d0fc397fe1c474150883e85a791a012a7ae03380 (diff) |
Resolve merge conflicts for upstream merge
Diffstat (limited to 'view_operations.php')
-rwxr-xr-x | view_operations.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/view_operations.php b/view_operations.php index 08c26d6e13..2149e15eb9 100755 --- a/view_operations.php +++ b/view_operations.php @@ -9,7 +9,6 @@ * */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; $pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']); @@ -106,5 +105,5 @@ $url_params['back'] = 'view_operations.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> |