comparison etc/emacs.py @ 63651:26ce1e6e98e5

Remove conflict markers.
author Lute Kamstra <lute@gnu.org>
date Wed, 22 Jun 2005 07:36:03 +0000
parents f5a115d3c85e
children 23a17af379b1
comparison
equal deleted inserted replaced
63650:906515736089 63651:26ce1e6e98e5