From: Miles Bader <miles@gnu.org>
Date: Sat, 7 Oct 2000 02:38:22 +0000 (+0000)
Subject: Fix merge screwup.
X-Git-Tag: emacs-pretest-21.0.90~1082
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=56cc166567530679ca611a3b76dd6a33e1d90f11;p=emacs.git

Fix merge screwup.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85acae57ef7..5ef7457d88b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -49,11 +49,6 @@
 	latter needs the autoloaded define-minor-mode macro during the
 	bootstrap.
 
-2000-10-06  Miles Bader  <miles@lsi.nec.co.jp>
-
-	* simple.el (shell-command-on-region): If the output is short
-	enough to display in an expanded echo area, show it here.
-
 	* startup.el (command-line): For now, activate tool-bar-mode only
 	if XPM images are supported.