diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 0 insertions, 5 deletions
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> |