From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 7 Jan 2012 20:00:56 +0000 (-0800)
Subject: Fix ChangeLog typo.
X-Git-Tag: emacs-pretest-24.0.93~97^2~53
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1355012ad77702dc780a378b7e6819d99d076886;p=emacs.git

Fix ChangeLog typo.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4bb7352fcb..9e490a1e367 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  <michael.albinus@gmx.de>