Mercurial > emacs
comparison lisp/electric.el @ 43140:d3e6cbd3895e
Remove traces of merge conflicts.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Wed, 06 Feb 2002 16:24:25 +0000 |
parents | 253f761ad37b |
children | 37645a051842 |
comparison
equal
deleted
inserted
replaced
43139:22ff542d67ee | 43140:d3e6cbd3895e |
---|