diff options
author | Kenichi Handa <handa@etlken> | 2010-07-14 12:53:53 +0900 |
---|---|---|
committer | Kenichi Handa <handa@etlken> | 2010-07-14 12:53:53 +0900 |
commit | ebd3d6afa42948e3fb136583f12f9f72e7830ec5 (patch) | |
tree | 5294a6d78466de1543250d2249920fb1c86376bb /lisp/emacs-lisp/lisp-mode.el | |
parent | 73a4405a3539be595a6360c9e207d6ee2995a0c4 (diff) | |
download | emacs-ebd3d6afa42948e3fb136583f12f9f72e7830ec5.tar.gz emacs-ebd3d6afa42948e3fb136583f12f9f72e7830ec5.tar.bz2 emacs-ebd3d6afa42948e3fb136583f12f9f72e7830ec5.zip |
Fix previous conflict.
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
0 files changed, 0 insertions, 0 deletions