diff options
| author | ninadsp <ninadsp16289@gmail.com> | 2010-07-23 20:29:15 +0400 |
|---|---|---|
| committer | ninadsp <ninadsp16289@gmail.com> | 2010-07-23 20:29:15 +0400 |
| commit | e646a2760c65204894cb96a7cce61469bee5b9e3 (patch) | |
| tree | 323f49566513965362b5e51b58a57f6716791daf /server_binlog.php | |
| parent | 13ec1423f61e613e653872f3066ca7c9032306d1 (diff) | |
| parent | 049886139c62c3ed8b6573a0637ec5516857661f (diff) | |
Fixed conflict due to upstream merge
Diffstat (limited to 'server_binlog.php')
| -rwxr-xr-x | server_binlog.php | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/server_binlog.php b/server_binlog.php index c8dd614973..bfa4e07016 100755 --- a/server_binlog.php +++ b/server_binlog.php @@ -8,19 +8,6 @@ * @uses $cfg['MaxRows'] * @uses $cfg['LimitChars'] * @uses $pmaThemeImage - * @uses __('Binary log') - * @uses __('Go') - * @uses __('Truncate Shown Queries') - * @uses __('Show Full Queries') - * @uses __('Log name') - * @uses __('Position') - * @uses __('Event type') - * @uses __('Server ID') - * @uses __('Original position') - * @uses __('Information') - * @uses __('Files') - * @uses __('Previous') - * @uses __('Next') * @uses $binary_logs * @uses PMA_generate_common_hidden_inputs() * @uses PMA_generate_common_url() @@ -35,7 +22,6 @@ * @uses array_key_exists() * @uses implode() * @uses htmlspecialchars() - * @version $Id$ * @package phpMyAdmin */ |