Browse files

Fix ChangeLog typo.

  • Loading branch information...
1 parent 649e7e6 commit 9e9979f06b0401cab2e6818c9f1b9443a0f22227 @eggert eggert committed Jan 7, 2012
Showing with 0 additions and 1 deletion.
  1. +0 −1 lisp/ChangeLog
View
1 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>

0 comments on commit 9e9979f

Please sign in to comment.