diff src/COPYING @ 70111:9f68cc95e2da

Remove conflict marker.
author Romain Francoise <romain@orebokech.com>
date Wed, 19 Apr 2006 06:29:47 +0000
parents d92149473c34
children 6aa0743375c1
line wrap: on
line diff