Re: Building on OS X

When you update via CVS, collisions are marked with diff/patch-like syntax.
So, you just need to remove those files that are giving you trouble and do
another update.

--
Rodney Sparapani              Medical College of Wisconsin
Sr. Biostatistician           Patient Care & Outcomes Research
rsparapa@xxxxxxx              http://www.mcw.edu/pcor
Was 'Name That Tune' rigged?  WWLD -- What Would Lombardi Do