projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 274f135)
Remove conflict marker.
authorDavid Kastrup <dak@gnu.org>
Sat, 8 Dec 2007 01:06:12 +0000 (01:06 +0000)
committerDavid Kastrup <dak@gnu.org>
Sat, 8 Dec 2007 01:06:12 +0000 (01:06 +0000)
lisp/gnus/ChangeLog patch | blob | history

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fff3a246d8f13a7dd5b17e297201926b130927c2..3bc43a4c1f5879dd05f8c123e1b789fe5145dba4 100644 (file)
--- 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.
Unnamed repository; edit this file 'description' to name the repository.