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