Mercurial > emacs
diff lisp/emacs-lisp/lisp.el @ 32354:eaa80d9a03d4
Remove CVS merge cookie left in.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 10 Oct 2000 02:32:57 +0000 |
parents | d481da7b59b0 |
children | ec203cfd2e41 |
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 10 Oct 2000 02:32:57 +0000 |
parents | d481da7b59b0 |
children | ec203cfd2e41 |