[Mldonkey-users] Re: ./configure script aborts (v -16)

[Sven Hartge]

Jörg Maisenbacher <address@hidden> wrote:

> I just did a fresh CVS-update. But i was not able to do a ./configure
> here the last few lines of output:
> 
> --SNIP---
> checking for perl... (cached) /usr/bin/perl
> ocamlc version is 3.06
> ocamlopt version is 3.06
> checking size of int... ./configure: line 1932: syntax error near 
> unexpected token `<<<<<'
> ./configure: line 1932: `<<<<<<< configure'
> $
> 
> ----SNAP---

This is a conflict marked by CVS.

Either resolve the conflicht manually or just delete the file and
update again.

Files with conflicts during update are marked with a 'C' in the first
column, whereas files, which get patched are marked with 'P' and files
which are checked out completely (because the patch would be bigger than
the file itself) are marked with a 'U'.

S°

-- 
Fachbegriffe der Informatik - Einfach erklärt
83: professionelle Arbeit
       echo "TEST" != "TEST" (Marcus Herbert)