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 /tbl_create.php | |
parent | 13ec1423f61e613e653872f3066ca7c9032306d1 (diff) | |
parent | 049886139c62c3ed8b6573a0637ec5516857661f (diff) |
Fixed conflict due to upstream merge
Diffstat (limited to 'tbl_create.php')
-rwxr-xr-x | tbl_create.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tbl_create.php b/tbl_create.php index 9d87c1d80e..a5cdb04b65 100755 --- a/tbl_create.php +++ b/tbl_create.php @@ -4,10 +4,6 @@ * @uses $cfg['DefaultTabDatabase'] * @uses $GLOBALS['table'] * @uses $GLOBALS['db'] - * @uses __('The table name is empty!') - * @uses __('Table %s already exists!') - * @uses __('Table') - * @uses __('Table %1 has been created.') * @uses PMA_Table::generateFieldSpec() * @uses PMA_checkParameters() * @uses PMA_generateCharsetQueryPart() @@ -31,7 +27,6 @@ * @uses strlen() * @uses sprintf() * @uses htmlspecialchars() - * @version $Id$ * @package phpMyAdmin */ |