Build error xfwm4

[Russ Pitman]

On Sat, Jan 25, 2003 at 02:21:41PM +0530, Biju Chacko wrote:
> On Sat, 25 Jan 2003 11:37:51 -0800, Russ Pitman wrote:
> 
> > Oh dear,
> > 
> > This one is
> > 
> >       Press any key to
> >       continue...root at belle:/usr/local/xfce-devel/xfwm4# ./configure
> >       && make && make install./configure: line 458: syntax error near
> >       unexpected token `<<<'./configure: line 458: `<<<<<<< configure'
> >       Press any key to continue...
> 
> You probably generated your own ./configure at some point. CVS could not
> resolve the differences and put markers to show the error points.
> 
> Either regenerate ./configure using autogen.sh or delete it and recheck
> out cvs.
> 
> -- b
> 
Just finished doing that. Same results. BTW I did use autogen.sh on both these
files after the first run to see if that helped. 

Unless my system isn't updating the files properly, tho I can't imagine why.
-- 

Cheers,
russ.