Resolve conflicts.

Browse Source

* Note that option hostname is only honored if the hostname is not
    already set. (r1.2)

...

This commit is contained in:

Murray Stokely 2002-02-19 12:15:09 +00:00

parent e51a769ab7

commit edc4c2b49d

Notes: svn2git 2020-12-20 02:59:44 +00:00

svn path=/head/; revision=90917

1 changed files with 1195 additions and 383 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1578

contrib/isc-dhcp/common/dhcp-options.5

View File

File diff suppressed because it is too large Load Diff