On Wed, 26 Oct 2005 22:59:03 +0200
Roland Illig <rillig@NetBSD.org> wrote:

> The "<<<<<<" almost always means that you have a CVS conflict. Run "cvs 
> update" and watch the lines starting with "C ". Then fix these files.
> 
> Roland

What does that mean?? Do I have to upgrade my cvs utilities or simply removing
pkgsrc tree and doing a fresh checkout will fix it?