Vincent GROSS wrote: > there seem to be a lil' problem with > /usr/src/usr/sbin/dhcpd/options.c. the following patch > highlights two weirds constructs inside the file, one in the > header, the other one in the MMS checking code. > > --- /usr/src/usr.sbin/dhcpd/options.c Sat Nov 10 04:53:05 2007 > +++ ./options.c Sat Nov 10 15:17:50 2007 > @@ -1,8 +1,4 @@ > -<<<<<<< options.c > -/* $OpenBSD: options.c,v 1.8.4.1 2007/10/10 06:10:27 ckuethe Exp $ */ > -======= > /* $OpenBSD: options.c,v 1.19 2007/10/29 16:51:02 krw Exp $ */ > -> > > > > > > 1.19
That's a conflict, and it's caused by you, and only exists in your version. :-) Just kill the file and check it out again. # Han
