Mercurial > emacs

changeset 62560:56541edc86ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove CVS conflict markers.
author Reiner Steib <Reiner.Steib@gmx.de>
date Fri, 20 May 2005 17:47:03 +0000
parents 36a36b2ac60d
children a8d780395b8f
files man/ChangeLog
diffstat 1 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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.