Freetz 3606 / sytax error

[winflowers]

When I tried to build the image with latest Freetz-trunck 3606, I got the following error message:

./fwmod: line 1115: syntax error near unexpected token `<<<'
./fwmod: line 1115: `<<<<<<< .mine'

What could be the problem?
I put my .config file in the attachment.

 

[Silent-Tears]

You have changed the fwmod in some way before you did a "svn up".

After:

rm  fwmod && svn up

the file should work again, but all your changes are undone.

 

[winflowers]

You have changed the fwmod in some way before you did a "svn up".

After:

rm  fwmod && svn up

the file should work again, but all your changes are undone.

It works. Thank you!