Remove erroneously-committed merge comment.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 08132ec..e3031dd 100644 (file)
--- 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):