Fix merge screwup.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85acae57ef773aff765d7982c2db1e4040f5771f..5ef7457d88b04f36e93f8d8443803b579be660f8 100644 (file)
--- 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.