From 0fc459a3f1538ecb04505031939823e88a24be14 Mon Sep 17 00:00:00 2001
From: Reuben Thomas <rrt@sc3d.org>
Date: Fri, 18 Oct 2013 09:48:33 +0100
Subject: [PATCH] Remove erroneously-committed merge comment.

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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):
-- 
2.39.2