Re: configure broken?

[Marcus Meissner]

On Sat, Dec 15, 2001 at 01:02:35PM +0100, Oliver Sampson wrote:
> Howdy,
> I just tried to update my CVS version and I get the following:
>
> checking size of long long... ./configure: line 6355: syntax error
> near unexpected token `<<<<<'
> ./configure: line 6355: `<<<<<<< configure'
>
> Really, all is did was type 'cvs update' :-)

This is just a merge conflict. Either do
    rm configure ; cvs update configure
or just:
    autoconf
if you have autoconf installed.

Ciao, Marcus