Remove conflict marker.

df04db0b · David Kastrup · 274f1353 · df04db0b
Commit df04db0b authored Dec 08, 2007 by David Kastrup
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

lisp/gnus/ChangeLog lisp/gnus/ChangeLog +0 -1

No files found.
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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.