On Tue, Jan 05, 2010 at 11:32:10PM -0500, [email protected] wrote:
> 
> It looks to me like menustyle.c has some CVS conflict markers in it.

You must have local edits to that file when you did a "cvs up"?  The copy
of menustyle.c on the CVS server has no such conflict markers.

-- Thomas Adam

-- 
"It was the cruelest game I've ever played and it's played inside my head."
-- "Hush The Warmth", Gorky's Zygotic Mynci.

Reply via email to