1 files changed, 11 insertions, 0 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index acde7c5b491..077d393f521 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-20  Carsten Dominik  <dominik@science.uva.nl>
+
+        * org.texi: Version 3.09
+
+<<<<<<< ChangeLog
+2005-05-18  Carsten Dominik  <dominik@science.uva.nl>
+
+        * reftex.texi: Version 4.28
+
+=======
 2005-05-18  Luc Teirlinck  <teirllm@auburn.edu>
 
         * buffers.texi (Select Buffer): Document `C-u M-g M-g'.
@@ -114,6 +124,7 @@
 
         * building.texi (Debugger Operation): Clarify previous change.
 
+>>>>>>> 1.574
 2005-04-29  Carsten Dominik  <dominik@science.uva.nl>
 
         * org.texi: Version 3.08, structure reorganized.