emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-24 r116920: ChangeLog fix


From: Glenn Morris
Subject: [Emacs-diffs] emacs-24 r116920: ChangeLog fix
Date: Mon, 07 Apr 2014 00:04:07 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 116920
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-04-06 17:04:00 -0700
message:
  ChangeLog fix
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-06 23:37:17 +0000
+++ b/lisp/ChangeLog    2014-04-07 00:04:00 +0000
@@ -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  <address@hidden>
 
        * net/eww.el (eww-download-callback):


reply via email to

[Prev in Thread] Current Thread [Next in Thread]