diff options
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b4bb7352fc..9e490a1e36 100644 --- 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 <[email protected]> |