# HG changeset patch
# User David Kastrup <dak@gnu.org>
# Date 1197075972 0
# Node ID 4b0ef62e1965f5cb35809099b19dd80dd7adc181
# Parent  e50a2e215441efbcb1815cef62726041158aff6c
Remove conflict marker.

diff -r e50a2e215441 -r 4b0ef62e1965 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Dec 08 01:02:29 2007 +0000
+++ b/lisp/gnus/ChangeLog	Sat Dec 08 01:06:12 2007 +0000
@@ -77,7 +77,6 @@
 	(rfc2047-encoded-word-regexp-loose): Move forward; add comments
 	explaining what regexp patterns are for.
 
->>>>>>> 1.607
 2007-12-04  Glenn Morris  <rgm@gnu.org>
 
 	* password.el: Move to ../password-cache.el.