Mercurial > emacs
diff lisp/mh-e/ChangeLog @ 109936:e1a5ebb1ce1c
lisp/ChangeLog: Remove merge markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | bfc8980754ed |
children | 973b5bc5fcfe 376148b31b5e |