From: Romain Francoise <romain@orebokech.com>
Date: Sun, 13 Jan 2013 21:26:10 +0000 (+0100)
Subject: Delete merge marker.
X-Git-Tag: emacs-24.3.90~173^2~7^2~307
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b35b088608a02d43b39bbfd3240547d3d9de7366;p=emacs.git

Delete merge marker.
---

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