Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30
parent 13ec1423f6 049886139c
commit e646a2760c
331 changed files with 127280 additions and 132228 deletions
--- a/tbl_get_field.php
+++ b/tbl_get_field.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 * Provides download to a given field defined in parameters.
- * @version $Id$
 * @package phpMyAdmin
 */