ChangeLog merge fix

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b70008fb8216ea4b37dd6bdbfe7906b54d709b81..372fc63fc8b8ae63801e1f64f0c88ba7b2802c26 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -19,12 +19,6 @@
        * desktop.el (desktop-read): Clear previous and next buffers for
        all windows and bury *Messages* buffer (bug#11556).
 
-2012-05-31  Eli Zaretskii  <eliz@gnu.org>
-
-       * mail/sendmail.el (mail-yank-region): Recognize
-       rmail-yank-current-message in addition to insert-buffer.  Fixes
-       mail-mode's "C-c C-r" that otherwise does nothing when invoked in
-
 2012-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        Add `declare' for `defun'.  Align `defmacro's with it.