Mercurial > emacs
diff src/ChangeLog.2 @ 109936:e1a5ebb1ce1c
lisp/ChangeLog: Remove merge markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | 1d1d5d9bd884 |
children | 0eb2f9d5e474 cda2045a5ee8 |
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | 1d1d5d9bd884 |
children | 0eb2f9d5e474 cda2045a5ee8 |