Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove conflict marker.

Browse source
This commit is contained in:
David Kastrup 2007-12-08 01:06:12 +00:00
parent 274f1353e0
commit df04db0bcb
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/gnus/ChangeLog
View file

@ -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.