Fix ChangeLog typo.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4bb7352fcbd9b4f0a4da452f001c9b09ca5d5a6..9e490a1e367fae6a4a83176f15d254910bfdad16 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -133,7 +133,6 @@
 
        * mail/rmail.el (rmail-show-message-1): Decode any RFC2047 encoded
        headers of non-MIME messages, when rmail-enable-mime is non-nil.
->>>>>>> MERGE-SOURCE
 
 2011-12-29  Michael Albinus  <michael.albinus@gmx.de>