From c262a571d186f5c6e6d0e150e7e5dbde71093d3e Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Tue, 2 Sep 2003 11:10:29 +0000 Subject: [PATCH] Resolve conflicts. * rev. 1.22 --- contrib/isc-dhcp/client/scripts/freebsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/isc-dhcp/client/scripts/freebsd b/contrib/isc-dhcp/client/scripts/freebsd index b79a440f858b..7202f5f2ba3d 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$