ChangeLog fix

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15b1a38e8201c2e33839a657f318ec2ee576925a..87d834af763ca3dfc3aaa6c2a41b862dcea1a891 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -557,7 +557,6 @@
        FILENAME.
 
        * net/trampver.el: Update release number.
->>>>>>> MERGE-SOURCE
 
 2014-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>