jeffd
committed
on 15 Feb 03
remove conflict markers from Dons commit. fixes bug 243