# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 970886302 0
# Node ID 9f5f8cb6cb325eba5b6f4fda6b24a86246adc30d
# Parent  2cf1369b3b02fef8efcad2f20e405bf916bb2321
Fix merge screwup.

diff -r 2cf1369b3b02 -r 9f5f8cb6cb32 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Oct 06 22:55:11 2000 +0000
+++ b/lisp/ChangeLog	Sat Oct 07 02:38:22 2000 +0000
@@ -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.