From: Reiner Steib <Reiner.Steib@gmx.de>
Date: Fri, 20 May 2005 17:47:03 +0000 (+0000)
Subject: Remove CVS conflict markers.
X-Git-Tag: ttn-vms-21-2-B4~114
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=57d8ef63ee3d246f4726c7f0c28173b31faad58e;p=emacs.git

Remove CVS conflict markers.
---

diff --git a/man/ChangeLog b/man/ChangeLog
index 077d393f521..e5997fab28b 100644
--- 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.