Mercurial > emacs
changeset 39547:99e89f7ad24e
*** empty log message ***
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 04 Oct 2001 10:38:36 +0000 |
| parents | bd039ea0897e |
| children | 6192be048459 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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>