diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-08-19 01:32:39 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-08-19 01:32:39 +0200 |
| commit | 9b3d6a42efd17fb2a9f01b128b10b17da5296c98 (patch) | |
| tree | cde5aa4655232ddf9e60aca86669b4b4232a4e46 /lisp/emacs-lisp/lisp.el | |
| parent | a67e6f13345ce7307ada22a8226da192f47299ac (diff) | |
| download | emacs-9b3d6a42efd17fb2a9f01b128b10b17da5296c98.tar.gz emacs-9b3d6a42efd17fb2a9f01b128b10b17da5296c98.tar.bz2 emacs-9b3d6a42efd17fb2a9f01b128b10b17da5296c98.zip | |
lisp/ChangeLog: Remove merge markers.
Diffstat (limited to 'lisp/emacs-lisp/lisp.el')
0 files changed, 0 insertions, 0 deletions