diff options
author | murray <murray@FreeBSD.org> | 2003-01-15 10:47:32 +0000 |
---|---|---|
committer | murray <murray@FreeBSD.org> | 2003-01-15 10:47:32 +0000 |
commit | 47afd0c33001f58ff1492d002ad0cffaac46a9d8 (patch) | |
tree | bc39cd52c197e4f5c62e0c50f1aed873ef8d2f41 /contrib/isc-dhcp/client/dhclient.leases.5 | |
parent | 82de6974f10d903a3fdc7691f13f5078591616ba (diff) | |
download | FreeBSD-src-47afd0c33001f58ff1492d002ad0cffaac46a9d8.zip FreeBSD-src-47afd0c33001f58ff1492d002ad0cffaac46a9d8.tar.gz |
Resolve conflicts.
Diffstat (limited to 'contrib/isc-dhcp/client/dhclient.leases.5')
-rw-r--r-- | contrib/isc-dhcp/client/dhclient.leases.5 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/isc-dhcp/client/dhclient.leases.5 b/contrib/isc-dhcp/client/dhclient.leases.5 index d19737c..a1931e7 100644 --- a/contrib/isc-dhcp/client/dhclient.leases.5 +++ b/contrib/isc-dhcp/client/dhclient.leases.5 @@ -37,6 +37,7 @@ .\" Enterprises, see ``http://www.vix.com''. .\" .\" $FreeBSD$ +.\" $Id: dhclient.leases.5,v 1.2.4.2 2002/05/27 04:18:44 murray Exp $ .\" .TH dhclient.leases 5 .SH NAME |