summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/gnus/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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.