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/db_operations.php
+++ b/db_operations.php
@@ -9,7 +9,6 @@
 *  - adding tables
 *  - viewing PDF schemas
 *
- * @version $Id$
 * @package phpMyAdmin
 */