# HG changeset patch
# User Pavel Jan���k <Pavel@Janik.cz>
# Date 1013969871 0
# Node ID f346396ec985ca8753053c20356c59b9d3d4ef9a
# Parent  ce9f8721c9183d173175f8c5604d7c6e1dc19914
*** empty log message ***

diff -r ce9f8721c918 -r f346396ec985 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Feb 17 18:08:44 2002 +0000
+++ b/lisp/ChangeLog	Sun Feb 17 18:17:51 2002 +0000
@@ -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