# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 1002191916 0
# Node ID 99e89f7ad24e346770eb84e00b0c9f0dfa3457aa
# Parent  bd039ea0897e4d97f7401505c35c686daa299f79
*** empty log message ***

diff -r bd039ea0897e -r 99e89f7ad24e lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Oct 04 07:18:32 2001 +0000
+++ b/lisp/ChangeLog	Thu Oct 04 10:38:36 2001 +0000
@@ -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>