diff FTP @ 70883:910efa724a98

Remove conflict indicators.
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 24 May 2006 14:25:50 +0000
parents 6cd56cde7cd4
children 5e1b6a63ac46
line wrap: on
line diff