1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 4363c4125a..7085bd4df9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-18  bertrand  <Bertrand.Guiheneuf@inria.fr>
+
+	* camel/camel-mime-message.c (*_message_number): 
+	message number funcs.
+	
 1999-05-15  bertrand  <Bertrand.Guiheneuf@inria.fr>
 
 	* camel/camel-mime-message.c (*_flag): 
@@ -217,6 +222,7 @@
 	* camel/camel-folder.h:
 	correct declarations of structs
 
+>>>>>>> 1.36
 1999-04-22  bertrand <Bertrand.Guiheneuf@inria.fr>
 
 	* camel/providers/MH/camel-mh-store.c: