From: Pavel Janík <Pavel@Janik.cz>
Date: Sun, 17 Feb 2002 18:17:51 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~16593
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c484a3a28074c4564e342440f148a7abafc37ba3;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fed1e178e32..14f99c756fb 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