# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1121853698 0
# Node ID 4b1847f05684e574348debf3e94297193ba1f6eb
# Parent  da15be47f5c0382f534b22448cd4a71a550a1129
Remove conflict markers.

diff -r da15be47f5c0 -r 4b1847f05684 man/ChangeLog
--- a/man/ChangeLog	Wed Jul 20 06:58:24 2005 +0000
+++ b/man/ChangeLog	Wed Jul 20 10:01:38 2005 +0000
@@ -2,12 +2,10 @@
 
 	* org.texi: Version 3.14
 
-<<<<<<< ChangeLog
 2005-07-04  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.texi: Version 3.13
 
-=======
 2005-07-19  Juri Linkov  <juri@jurta.org>
 
 	* files.texi (Comparing Files): Mention resync for `compare-windows'.