# HG changeset patch
# User Reiner Steib <Reiner.Steib@gmx.de>
# Date 1116611223 0
# Node ID 56541edc86ad3ada7f66675fad6e90b82820bee1
# Parent  36a36b2ac60d98b8d8b20b9b8d09ee4e001ad679
Remove CVS conflict markers.

diff -r 36a36b2ac60d -r 56541edc86ad man/ChangeLog
--- a/man/ChangeLog	Fri May 20 16:41:36 2005 +0000
+++ b/man/ChangeLog	Fri May 20 17:47:03 2005 +0000
@@ -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.