summaryrefslogtreecommitdiff
path: root/client/dhclient.leases.5
diff options
context:
space:
mode:
authorWlodek Wencel <wlodek@isc.org>2022-01-25 18:57:28 +0100
committerWlodek Wencel <wlodek@isc.org>2022-01-25 18:57:28 +0100
commite9d37e26897a349f8483092fd0305ea03a97b0e2 (patch)
tree5ccf3e3afaee5c9cbce00d23db33c4af019de32b /client/dhclient.leases.5
parent8eec892acc041bbdb361d1c1ac36a26b3d3cc2db (diff)
parent3d53b2f2a0369c2af83c738d4e8194077315cbb4 (diff)
downloadisc-dhcp-e9d37e26897a349f8483092fd0305ea03a97b0e2.tar.gz
resolved merge conflictsv4_4_3b1v4_4
Diffstat (limited to 'client/dhclient.leases.5')
-rw-r--r--client/dhclient.leases.56
1 files changed, 3 insertions, 3 deletions
diff --git a/client/dhclient.leases.5 b/client/dhclient.leases.5
index d151753f..4d9c3d62 100644
--- a/client/dhclient.leases.5
+++ b/client/dhclient.leases.5
@@ -1,6 +1,6 @@
.\" $Id: dhclient.leases.5,v 1.8 2011/02/23 23:50:55 sar Exp $
.\"
-.\" Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (c) 1997-2003 by Internet Software Consortium
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
@@ -16,8 +16,8 @@
.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
.\" <info@isc.org>
.\" https://www.isc.org/
.\"