[mythtv] configure script problem

[Daniel Kristjansson]

On Fri, 2006-05-26 at 15:55 +0100, Mike Parkins wrote:
> There's something different in the latest svn which has confused my simple 
> brain, how do I run it now with this extra stuff in it?
> 
> ./configure: line 57: syntax error near unexpected token `<<<'
> ./configure: line 57: `<<<<<<< .mine'

Delete the script and run "svn update".

There is some conflict with a local change to the script.

-- Daniel