From: David Kastrup <dak@gnu.org>
Date: Sat, 8 Dec 2007 01:06:12 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: emacs-pretest-23.0.90~9019
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df04db0bcbba5f72ea7da471469d7b44f1d97ea0;p=emacs.git

Remove conflict marker.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fff3a246d8f..3bc43a4c1f5 100644
--- 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.