Commit df04db0b authored by David Kastrup's avatar David Kastrup
Browse files

Remove conflict marker.

parent 274f1353
......@@ -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 <>
* password.el: Move to ../password-cache.el.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment