summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-10-04 10:38:36 +0000
committerGerd Moellmann <gerd@gnu.org>2001-10-04 10:38:36 +0000
commit9c5becd89aee50c301f5a70a03e8728ce5400bb9 (patch)
tree7887c38169263f3a2e8c26e01c6fff97069e38c7 /lisp
parentcf2b0d2c99939df5312e7c6bee94c383c95ab4fe (diff)
downloademacs-9c5becd89aee50c301f5a70a03e8728ce5400bb9.tar.gz
emacs-9c5becd89aee50c301f5a70a03e8728ce5400bb9.tar.bz2
emacs-9c5becd89aee50c301f5a70a03e8728ce5400bb9.zip
*** empty log message ***
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
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>