Revision: miles@gnu.org--gnu-2004/gnus--devo--0--patch-156

Remove merge noise

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-61
   Update from CVS

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5ed474..13be157 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -25,7 +25,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): Removed.  Use `goto-char'