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 /querywindow.php | |
| parent | 13ec1423f61e613e653872f3066ca7c9032306d1 (diff) | |
| parent | 049886139c62c3ed8b6573a0637ec5516857661f (diff) | |
Fixed conflict due to upstream merge
Diffstat (limited to 'querywindow.php')
| -rwxr-xr-x | querywindow.php | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/querywindow.php b/querywindow.php index 0d15de5f74..7b2b08d1bd 100755 --- a/querywindow.php +++ b/querywindow.php @@ -12,15 +12,6 @@ * @uses $cfg['Confirm'] * @uses $GLOBALS['db'] * @uses $GLOBALS['table'] - * @uses __('SQL') - * @uses __('Import files') - * @uses __('SQL history') - * @uses __('All') - * @uses __('Change') - * @uses __('Missing value in the form!') - * @uses __('This is not a number!') - * @uses __('"DROP DATABASE" statements are disabled.') - * @uses __('Do you really want to ') * @uses PMA_isSuperuser() * @uses PMA_outBufferPre() * @uses PMA_getRelationsParam() @@ -37,7 +28,6 @@ * @uses strlen() * @uses preg_replace() * @uses htmlspecialchars() - * @version $Id$ * @package phpMyAdmin */ |