Mercurial > emacs
diff src/lread.c @ 109936:e1a5ebb1ce1c
lisp/ChangeLog: Remove merge markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | de58fd0baac5 |
children | 60516122d066 2f23047ca654 913b779aa4ee |