diff options
| author | mbr <mbr@FreeBSD.org> | 2003-09-02 11:10:29 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2003-09-02 11:10:29 +0000 |
| commit | bc435cf92417e0fa80f81a1072fe670bc5526d51 (patch) | |
| tree | 0b7aac4cc48b4300d0a0767f4f11eda08409e270 /contrib/isc-dhcp | |
| parent | 30c9dcd76d7c230bcde52165c16c72a02ea17ef0 (diff) | |
| download | FreeBSD-src-bc435cf92417e0fa80f81a1072fe670bc5526d51.zip FreeBSD-src-bc435cf92417e0fa80f81a1072fe670bc5526d51.tar.gz | |
Resolve conflicts.
* rev. 1.22
Diffstat (limited to 'contrib/isc-dhcp')
| -rwxr-xr-x | contrib/isc-dhcp/client/scripts/freebsd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/isc-dhcp/client/scripts/freebsd b/contrib/isc-dhcp/client/scripts/freebsd index b79a440..7202f5f 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.4 2002/06/09 22:37:55 murray Exp $ +# $Id: freebsd,v 1.13.2.5 2003/04/27 19:44:01 dhankins Exp $ # # $FreeBSD$ |
