Module Name:	basesrc
Committed By:	mellon
Date:		Sat Jul  8 20:53:58 UTC 2000

Modified Files:
	basesrc/usr.sbin/dhcp/common: options.c

Log Message:
Oops, fix one more conflict.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 basesrc/usr.sbin/dhcp/common/options.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.