Mercurial > emacs
diff lisp/gnus/nndiary.el @ 109936:e1a5ebb1ce1c
lisp/ChangeLog: Remove merge markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | 855f55740303 |
children | 8d09094063d0 376148b31b5e |