Mercurial > emacs
comparison lisp/textmodes/enriched.el @ 109388:64d1dc916ed8
Fix previous conflict.
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Wed, 14 Jul 2010 12:53:53 +0900 |
| parents | 1d1d5d9bd884 |
| children | 7c4da622f181 376148b31b5e |
comparison
equal
deleted
inserted
replaced
| 109387:2bc66123f2c6 | 109388:64d1dc916ed8 |
|---|