diff COPYING @ 5459:413bf5efaedb

Remove leftover conflict markers.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sun, 24 Apr 2011 00:15:47 +0900
parents 82f276f9ad7c
children c36f065c3090
line wrap: on
line diff