[Ffmpeg-devel] svn 7328 : configure dies at <<<<<< .mine

Måns Rullgård mru
Sun Dec 17 20:45:30 CET 2006

sean <seandarcy2 at gmail.com> writes:

> Today's svn:
> License: GPL
> Creating config.mak and config.h...
> ./configure: line 2047: syntax error near unexpected token `<<<'
> ./configure: line 2047: `<<<<<<< .mine'

You've modified your configure locally, and there was a conflict when
you ran svn up.  Get a clean copy, e.g. using svn revert configure.

M?ns Rullg?rd
mru at inprovide.com

More information about the ffmpeg-devel mailing list