diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 45c5fd52d99..578f5e4fb49 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. |