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_select.php
+++ b/tbl_select.php
@@ -7,7 +7,6 @@
 * and include sql.php to execute it
 *
 * @todo display search form again if no results from previous search
- * @version $Id$
 * @package phpMyAdmin
 */