diff options
author | Reuben Thomas <rrt@sc3d.org> | 2013-10-18 09:48:33 +0100 |
---|---|---|
committer | Reuben Thomas <rrt@sc3d.org> | 2013-10-18 09:48:33 +0100 |
commit | 0fc459a3f1538ecb04505031939823e88a24be14 (patch) | |
tree | aea0859a25944560c7f45ae67e4cc1d5ba298b0a /lisp/emacs-lisp | |
parent | d64da4b71a0b928700e616977b90f1948bf1d1e8 (diff) | |
download | emacs-0fc459a3f1538ecb04505031939823e88a24be14.tar.gz emacs-0fc459a3f1538ecb04505031939823e88a24be14.tar.bz2 emacs-0fc459a3f1538ecb04505031939823e88a24be14.zip |
Remove erroneously-committed merge comment.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions