From c484a3a28074c4564e342440f148a7abafc37ba3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Pavel=20Jan=C3=ADk?= <Pavel@Janik.cz>
Date: Sun, 17 Feb 2002 18:17:51 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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
-- 
2.39.5