From 01c442500fe3494226420cf776a8ba4134dda74e Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Fri, 27 Jun 2014 21:55:17 -0400
Subject: [PATCH] ChangeLog fix

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15b1a38e820..87d834af763 100644
--- 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>
 
-- 
2.39.2