Mercurial > emacs
diff src/buffer.c @ 109936:e1a5ebb1ce1c
lisp/ChangeLog: Remove merge markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | fc5ebbbba4f3 |
children | a4b9fa0b861b 63399fcc7ef2 |
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | fc5ebbbba4f3 |
children | a4b9fa0b861b 63399fcc7ef2 |