diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-04-06 17:04:00 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-04-06 17:04:00 -0700 |
| commit | 79ebc53034684f176432c255ae3109323226871c (patch) | |
| tree | 5fed0f8d1f00f9db46c6be24d9b67d50bc05c29f | |
| parent | be411138140cdcdb4e1aec682c4e41354ab709e0 (diff) | |
| download | emacs-79ebc53034684f176432c255ae3109323226871c.tar.gz | |
ChangeLog fix
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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): |