[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111515: Delete merge marker.
|
From: |
Romain Francoise |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111515: Delete merge marker. |
|
Date: |
Sun, 13 Jan 2013 22:26:10 +0100 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111515
committer: Romain Francoise <address@hidden>
branch nick: trunk
timestamp: Sun 2013-01-13 22:26:10 +0100
message:
Delete merge marker.
modified:
lisp/gnus/ChangeLog
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2013-01-13 19:46:27 +0000
+++ b/lisp/gnus/ChangeLog 2013-01-13 21:26:10 +0000
@@ -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 <address@hidden>
* gnus-msg.el (gnus-inews-insert-gcc): Don't insert Gcc headers if Gnus
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111515: Delete merge marker.,
Romain Francoise <=