diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2014-01-09 11:49:05 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-01-09 11:49:05 -0500 |
| commit | 32f82e0ca596ed9357d541044970d9133639dc75 (patch) | |
| tree | e302ae87a12de6c772ae955a909fe230809e4f89 /lisp/emacs-lisp | |
| parent | f29778b343bc352a550033ab3d3e19e5a3ba677a (diff) | |
| download | emacs-32f82e0ca596ed9357d541044970d9133639dc75.tar.gz emacs-32f82e0ca596ed9357d541044970d9133639dc75.tar.bz2 emacs-32f82e0ca596ed9357d541044970d9133639dc75.zip | |
Remove stray conflicty markar that the VCS somehow ignored.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions