diff README @ 70111:9f68cc95e2da

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