From: Miles Bader <miles@gnu.org>
Date: Thu, 28 Oct 2004 08:35:20 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2004/gnus--devo--0--patch-156
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=dbafcf767ec74af06f01415dda1167a537a64852;p=gnus

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 f5ed474f4..13be157fe 100644
--- 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'