From: Glenn Morris <rgm@gnu.org>
Date: Fri, 9 Jan 2009 03:22:30 +0000 (+0000)
Subject: Fix merge error.
X-Git-Tag: emacs-pretest-23.0.90~614
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=85dce46f7b48e9f29aef9984abd86f9ff1fb0e33;p=emacs.git

Fix merge error.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f3404816ad6..e0a68e182a6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -122,10 +122,6 @@
 
 	* mm-util.el (mm-charset-override-alist): Declare for compiler.
 
-2008-12-16  Glenn Morris  <rgm@gnu.org>
-
-	* mm-util.el (mm-charset-override-alist): Declare for compiler.
-
 2008-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mml.el (mml-generate-mime-1): Prefer the MIME charset that Emacs