marcus at jet.franken.de
Sat Dec 15 07:35:28 CST 2001
On Sat, Dec 15, 2001 at 01:02:35PM +0100, Oliver Sampson wrote:
> 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
if you have autoconf installed.
More information about the wine-devel