Mercurial > emacs
diff 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 |
author | Kenichi Handa <handa@etlken> |
---|---|
date | Wed, 14 Jul 2010 12:53:53 +0900 |
parents | 1d1d5d9bd884 |
children | 7c4da622f181 376148b31b5e |