diff --git a/ChangeLog b/ChangeLog
index 264190e59..486a267db 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,6 @@ $Source$
     * header.inc.php: Wrong icon for views.
     * libraries/sqlparser.data.php: Added more missing date / time functions.
 
->>>>>>> 2.958
 2005-03-02 Michal Čihař  <michal@cihar.com>
     * libraries/export/sql.php, libraries/display_export.lib.php: Do not offer
       modes not available in current MySQL version, do not fail on error when