diff options
| author | David Kastrup <dak@gnu.org> | 2007-12-08 01:06:12 +0000 |
|---|---|---|
| committer | David Kastrup <dak@gnu.org> | 2007-12-08 01:06:12 +0000 |
| commit | df04db0bcbba5f72ea7da471469d7b44f1d97ea0 (patch) | |
| tree | 90a0e4106eb35a3ea59a8a40875c78735e67cf8d /lisp | |
| parent | 274f1353e0c442377ba2d2e713c6d670795232f4 (diff) | |
| download | emacs-df04db0bcbba5f72ea7da471469d7b44f1d97ea0.tar.gz emacs-df04db0bcbba5f72ea7da471469d7b44f1d97ea0.tar.bz2 emacs-df04db0bcbba5f72ea7da471469d7b44f1d97ea0.zip | |
Remove conflict marker.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 1 |
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. |