Merge Origin: Conflicts in js/functions.js

2010-07-22 16:03:50 +05:00
parent 14b26e314a 873ad99ed2
commit a7e3c0475c
331 changed files with 134166 additions and 128156 deletions
--- a/db_operations.php
+++ b/db_operations.php
@@ -9,7 +9,6 @@
 *  - adding tables
 *  - viewing PDF schemas
 *
- * @version $Id$
 * @package phpMyAdmin
 */