From: Andreas Schwab <schwab@suse.de>
Date: Wed, 20 Jul 2005 10:01:38 +0000 (+0000)
Subject: Remove conflict markers.
X-Git-Tag: emacs-pretest-22.0.90~7974
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ce3c4661fa923ab3936e8b68b3e3d11389de6bc;p=emacs.git

Remove conflict markers.
---

diff --git a/man/ChangeLog b/man/ChangeLog
index 341be9a3e42..43edb631b9c 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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'.