]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Resolve conflicts.
authorMurray Stokely <murray@FreeBSD.org>
Tue, 19 Feb 2002 12:15:09 +0000 (12:15 +0000)
committerMurray Stokely <murray@FreeBSD.org>
Tue, 19 Feb 2002 12:15:09 +0000 (12:15 +0000)
commitedc4c2b49d9d0f720254f60120618133ff263317
treebb1e3eb3d0bc6b56a52a7bc88856f12579be24e0
parente51a769ab78546eebe0e71b65735d1ffbe0dd38d
Resolve conflicts.
  * Note that option hostname is only honored if the hostname is not
    already set. (r1.2)
contrib/isc-dhcp/common/dhcp-options.5