summaryrefslogtreecommitdiffstats
path: root/contrib/isc-dhcp/client/scripts/freebsd
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2004-06-26 10:37:42 +0000
committermbr <mbr@FreeBSD.org>2004-06-26 10:37:42 +0000
commit4e40f399fecf9d0f0e8ca17159648ad46ea9f86c (patch)
treed903be4110c281897d6065df90848bd752b88210 /contrib/isc-dhcp/client/scripts/freebsd
parent1255e60c4d80338ad1bef8f82845886b69b802bf (diff)
downloadFreeBSD-src-4e40f399fecf9d0f0e8ca17159648ad46ea9f86c.zip
FreeBSD-src-4e40f399fecf9d0f0e8ca17159648ad46ea9f86c.tar.gz
Resolve conflicts.
Diffstat (limited to 'contrib/isc-dhcp/client/scripts/freebsd')
-rwxr-xr-xcontrib/isc-dhcp/client/scripts/freebsd2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/isc-dhcp/client/scripts/freebsd b/contrib/isc-dhcp/client/scripts/freebsd
index 2baf7f0..e35d8b5 100755
--- a/contrib/isc-dhcp/client/scripts/freebsd
+++ b/contrib/isc-dhcp/client/scripts/freebsd
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: freebsd,v 1.13.2.5 2003/04/27 19:44:01 dhankins Exp $
+# $Id: freebsd,v 1.13.2.6 2003/09/12 19:31:03 dhankins Exp $
#
# $FreeBSD$
OpenPOWER on IntegriCloud