X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2FChangeLog;h=d5d5f10ba541248d4e0afb80d4a4b5c8c9145656;hb=3ddc29404a95cc99fa50d0a8034ee812aa727a0f;hp=841fc054ae3ff5f7836ccd54d00374df64f36c37;hpb=35d4caf5dd53e46b446b30de210aebf7cde6cb2e;p=elisp%2Fgnus.git-

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 841fc05..d5d5f10 100644
--- 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'