Mercurial > emacs
comparison src/ChangeLog.8 @ 109936:e1a5ebb1ce1c
lisp/ChangeLog: Remove merge markers.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 19 Aug 2010 01:32:39 +0200 (2010-08-18) |
| parents | f46f743d330a |
| children | b3e4bcfa7d8b cda2045a5ee8 |
comparison
equal
deleted
inserted
replaced
| 109935:dbb2115db9d9 | 109936:e1a5ebb1ce1c |
|---|