From 9dcd90f7693f4eabdfae4f29cd1c40a4d3385529 Mon Sep 17 00:00:00 2001
From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 16 Apr 2014 12:03:38 +0200
Subject: [PATCH] lisp/ChangeLog: Remove merge marker.

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

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.
-- 
2.39.5