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/export/excel.php
+++ b/libraries/export/excel.php
@@ -4,7 +4,6 @@
 * Set of functions used to build CSV dumps of tables
 *
 * @package phpMyAdmin-Export-CSV
- * @version $Id$
 */
 if (! defined('PHPMYADMIN')) {
    exit;