diff lisp/diff-mode.el @ 46515:272c43ada087

Remove conflict marker.
author Andreas Schwab <schwab@suse.de>
date Thu, 18 Jul 2002 09:42:56 +0000
parents 4c4398249108
children d54b5b9a2b77
line wrap: on
line diff