From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 4 Oct 2001 10:38:36 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-21.1~86
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c5becd89aee50c301f5a70a03e8728ce5400bb9;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d3e2d41ac2..f18cb0b81dd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -45,12 +45,7 @@
 
 2001-10-01  Eli Zaretskii  <eliz@is.elta.co.il>
 
-<<<<<<< ChangeLog
 	* help.el (help-for-help): Doc fix.  From Pavel@Janik.cz (Pavel Janik).
-=======
-	* help.el (help-for-help): Doc fix.  From Pavel@Janik.cz (Pavel
-	Jan,Bm(Bk).
->>>>>>> 1.2772
 
 2001-09-30  Eli Zaretskii  <eliz@is.elta.co.il>