Remove CVS conflict markers.

diff --git a/man/ChangeLog b/man/ChangeLog
index 077d393f521d6f900de1aecb55eaae6e29ffe3f8..e5997fab28b38a747d3ffe174d9b50201242a288 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -2,12 +2,10 @@
 
        * 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'.
@@ -124,7 +122,6 @@
 
        * 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.