diff options
| author | Romain Francoise | 2013-01-13 22:26:10 +0100 |
|---|---|---|
| committer | Romain Francoise | 2013-01-13 22:26:10 +0100 |
| commit | b35b088608a02d43b39bbfd3240547d3d9de7366 (patch) | |
| tree | ffda3b4334b0c7ba3312a0392caa8ad04be49bd3 | |
| parent | c0511b57692c7a27d3632c34653dab5cfed629ef (diff) | |
| download | emacs-b35b088608a02d43b39bbfd3240547d3d9de7366.tar.gz emacs-b35b088608a02d43b39bbfd3240547d3d9de7366.zip | |
Delete merge marker.
| -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 f796f2d5558..1524f000450 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | (mml-smime-epg-find-usable-secret-key): New helper function copied from | 43 | (mml-smime-epg-find-usable-secret-key): New helper function copied from |
| 44 | mml2015.el. | 44 | mml2015.el. |
| 45 | 45 | ||
| 46 | >>>>>>> MERGE-SOURCE | ||
| 47 | 2012-12-31 Lars Magne Ingebrigtsen <larsi@gnus.org> | 46 | 2012-12-31 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 48 | 47 | ||
| 49 | * gnus-msg.el (gnus-inews-insert-gcc): Don't insert Gcc headers if Gnus | 48 | * gnus-msg.el (gnus-inews-insert-gcc): Don't insert Gcc headers if Gnus |