summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorPavel Janík <Pavel@Janik.cz>2002-02-17 18:17:51 +0000
committerPavel Janík <Pavel@Janik.cz>2002-02-17 18:17:51 +0000
commit823bd9c7bc04995b730b63ae95658dd768be0c50 (patch)
tree780d3510311e95176bb8886c9cb93e18f61211da /lisp
parent26c0762c63443e324d7ad4babeda41229dcc9746 (diff)
downloademacs-823bd9c7bc04995b730b63ae95658dd768be0c50.tar.gz
*** empty log message ***
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58976cce560..31402049a69 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -127,7 +127,6 @@
* eshell/esh-ext.el (eshell-script-interpreter): Allow whitespace
after the #! of a shell interpretor specification.
->>>>>>> 1.3466
2002-02-15 Richard M. Stallman <rms@gnu.org>
* help.el (describe-key-briefly): Make output in INSERT case