diff src/strftime.c @ 76254:5ae1368180c3

Remove conflict marker.
author Romain Francoise <romain@orebokech.com>
date Thu, 01 Mar 2007 13:58:24 +0000
parents e90d04cd455a
children 95d0cdf160ea 2bc9a0c04c87
line wrap: on
line diff