*** empty log message ***

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71671acc0a1ceaf624b4654fe4e3c442f0b69e11..f18cb0b81dd08365dc9841c6fd2fb6692df84f3f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,10 +2,10 @@
 
        * pcvs-util.el (cvs-prefix-define): Typo cons->concat.
 
-2001-10-02  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+2001-10-03  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * emulation/tpu-edt.el: Make messages match original TPU/edt
-       editor. From riepel@Stanford.EDU (Rob Riepel).
+       editor.  From riepel@Stanford.EDU (Rob Riepel).
 
 2001-10-03  Eli Zaretskii  <eliz@is.elta.co.il>
 
@@ -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\e,Bm\e(Bk).
->>>>>>> 1.2772
 
 2001-09-30  Eli Zaretskii  <eliz@is.elta.co.il>