Mercurial > emacs
diff .gitignore @ 109936:e1a5ebb1ce1c
lisp/ChangeLog: Remove merge markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | 9a2d92bd2a3e |
children | 6719c75fa3ac |
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | 9a2d92bd2a3e |
children | 6719c75fa3ac |