From: Glenn Morris <rgm@gnu.org>
Date: Mon, 7 Apr 2014 00:04:00 +0000 (-0700)
Subject: ChangeLog fix
X-Git-Tag: emacs-24.3.90~30
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=79ebc53034684f176432c255ae3109323226871c;p=emacs.git

ChangeLog fix
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92a221999ce..7fbb5cb960e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1942,7 +1942,6 @@
 	* net/shr.el (shr-tag-img): Prefer the title over the alt text
 	(bug#16537).
 
->>>>>>> MERGE-SOURCE
 2014-01-24  Juanma Barranquero  <lekktu@gmail.com>
 
 	* net/eww.el (eww-download-callback):