Mercurial > emacs
changeset 109936:e1a5ebb1ce1c
lisp/ChangeLog: Remove merge markers.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 19 Aug 2010 01:32:39 +0200 |
| parents | dbb2115db9d9 |
| children | 9b8e40e0bf3c |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Aug 18 20:24:52 2010 +0200 +++ b/lisp/ChangeLog Thu Aug 19 01:32:39 2010 +0200 @@ -73,7 +73,6 @@ (ctext-no-compositions): Doc fix. (compound-text-with-extensions): Doc fix. ->>>>>>> MERGE-SOURCE 2010-08-04 Stefan Monnier <monnier@iro.umontreal.ca> * simple.el (exchange-dot-and-mark): Mark obsolete, finally.