From: Glenn Morris <rgm@gnu.org>
Date: Sat, 28 Jun 2014 01:55:17 +0000 (-0400)
Subject: ChangeLog fix
X-Git-Tag: emacs-25.0.90~2636^2~76^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=01c442500fe3494226420cf776a8ba4134dda74e;p=emacs.git

ChangeLog fix
---

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>