[Emacs-diffs] Changes to emacs/lisp/gnus/ChangeLog,v

[David Kastrup]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     David Kastrup <dak>     07/12/08 01:06:13

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.615
retrieving revision 1.616
diff -u -b -r1.615 -r1.616
--- ChangeLog   8 Dec 2007 01:02:25 -0000       1.615
+++ ChangeLog   8 Dec 2007 01:06:12 -0000       1.616
@@ -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  <address@hidden>
 
        * password.el: Move to ../password-cache.el.