configure fails - >>>>> <<<<< =====

[David Shapiro]

Hello,

I just got the latest cvs, but configure fails on lines with things like:

>>>>>>> 1.273
=======
<<<<<<< configure

I used:


env CFLAGS="-Wall" ./configure --with-smbmount --with-automount
--enable-debug --with-winbind && make proto && make

Is it the -Wall option or something causing this?

David

David E. Shapiro
Senior Unix Admin
BTi - the future of communications
4300 Six Forks Road, Raleigh, NC 27609
Office # 1-919-865-6955 
Pager # 1-800520-2354
Fax    # 1-919-863-7340