# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1231471350 0
# Node ID 4b04254322f8afd785aeb9d8ed83b7a9c426630f
# Parent  89695da9e88c8c0df1922014e530e1c879648fe7
Fix merge error.

diff -r 89695da9e88c -r 4b04254322f8 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Fri Jan 09 03:19:39 2009 +0000
+++ b/lisp/gnus/ChangeLog	Fri Jan 09 03:22:30 2009 +0000
@@ -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