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/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -24,7 +24,6 @@
 * page for it to work, I recommend '<link rel="stylesheet" type="text/css"
 * href="syntax.css.php" />' at the moment.)
 *
- * @version $Id$
 * @package phpMyAdmin
 */
 if (! defined('PHPMYADMIN')) {