From: Reuben Thomas <rrt@sc3d.org>
Date: Fri, 18 Oct 2013 08:48:33 +0000 (+0100)
Subject: Remove erroneously-committed merge comment.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1223
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0fc459a3f1538ecb04505031939823e88a24be14;p=emacs.git

Remove erroneously-committed merge comment.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 08132ec6265..e3031dde7d8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6976,7 +6976,6 @@
 	* progmodes/f90.el (f90-imenu-generic-expression):
 	Fix typo in 2013-05-08 change.  (Bug#14402)
 
->>>>>>> MERGE-SOURCE
 2013-05-14  Jean-Philippe Gravel  <jpgravel@gmail.com>
 
 	* progmodes/gdb-mi.el (gdb-running, gdb-starting):