Synch to No Gnus 200502150045.

[elisp/gnus.git-] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 841fc05..d5d5f10 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el: Avoid "Recursive load suspected" error in Emacs 21.1.
+
 2005-02-14  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus.el (spam-contents): improve docs for spam-contents
@@ -888,7 +892,6 @@
        * hashcash.el: Fix URL in comment, reported by Cheng Gao
        <chenggao@gmail.com>.
 
->>>>>>> 7.511
 2004-10-25  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * html2text.el (html2text-buffer-head): Remove.  Use `goto-char'