native comments

2005-03-05 23:33:14 +00:00
parent f1f2009753
commit a449340d0c
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@@ -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