diff COPYING @ 62973:b89ed3c14158

Remove conflict marker.
author Andreas Schwab <schwab@suse.de>
date Fri, 03 Jun 2005 14:18:31 +0000
parents a21a2f14a765
children d92149473c34
line wrap: on
line diff