From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 16 Apr 2014 10:03:38 +0000 (+0200)
Subject: lisp/ChangeLog: Remove merge marker.
X-Git-Tag: emacs-25.0.90~2640^2~227
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9dcd90f7693f4eabdfae4f29cd1c40a4d3385529;p=emacs.git

lisp/ChangeLog: Remove merge marker.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 735b1c56c31..233a72e79df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -131,7 +131,6 @@
 	* subr.el (with-silent-modifications): Don't bind deactivate-mark,
 	buffer-file-name, and buffer-file-truename any more.
 
->>>>>>> MERGE-SOURCE
 2014-04-08  Leo Liu  <sdl.web@gmail.com>
 
 	Use lexical-binding and require cl-lib.