Mercurial > emacs
changeset 87171:4b0ef62e1965
Remove conflict marker.
| author | David Kastrup <dak@gnu.org> |
|---|---|
| date | Sat, 08 Dec 2007 01:06:12 +0000 |
| parents | e50a2e215441 |
| children | b8b9765bb434 |
| files | lisp/gnus/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Sat Dec 08 01:02:29 2007 +0000 +++ b/lisp/gnus/ChangeLog Sat Dec 08 01:06:12 2007 +0000 @@ -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.