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/scripts/decode_bug.php
+++ b/scripts/decode_bug.php
@@ -8,7 +8,6 @@
 *
 * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net>
 *
- * @version $Id$
 * @package phpMyAdmin-debug
 */