Commit b35b0886 authored by Romain Francoise's avatar Romain Francoise
Browse files

Delete merge marker.

parent c0511b57
......@@ -43,7 +43,6 @@
(mml-smime-epg-find-usable-secret-key): New helper function copied from
mml2015.el.
 
>>>>>>> MERGE-SOURCE
2012-12-31 Lars Magne Ingebrigtsen <larsi@gnus.org>
 
* gnus-msg.el (gnus-inews-insert-gcc): Don't insert Gcc headers if Gnus
......
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