Mercurial > emacs
comparison lisp/image-mode.el @ 109936:e1a5ebb1ce1c
lisp/ChangeLog: Remove merge markers.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 19 Aug 2010 01:32:39 +0200 |
| parents | 603e7bce46eb |
| children | a4b9fa0b861b 376148b31b5e |
comparison
equal
deleted
inserted
replaced
| 109935:dbb2115db9d9 | 109936:e1a5ebb1ce1c |
|---|