diff options
| author | obrien <obrien@FreeBSD.org> | 2000-11-04 19:59:11 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-11-04 19:59:11 +0000 |
| commit | fc00659ff5e60352a5570f9f32161f5a1d29a72a (patch) | |
| tree | 85e10fd91995f7ce678f32a396636f3160e6c409 /contrib | |
| parent | 8daecf5e59604c4c7323166b29996e38543818a5 (diff) | |
| download | FreeBSD-src-fc00659ff5e60352a5570f9f32161f5a1d29a72a.zip FreeBSD-src-fc00659ff5e60352a5570f9f32161f5a1d29a72a.tar.gz | |
Fix conflicts.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/isc-dhcp/client/dhclient.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/isc-dhcp/client/dhclient.c b/contrib/isc-dhcp/client/dhclient.c index dd66b50..69424a8 100644 --- a/contrib/isc-dhcp/client/dhclient.c +++ b/contrib/isc-dhcp/client/dhclient.c @@ -56,7 +56,7 @@ #ifndef lint static char ocopyright[] = -"$Id: dhclient.c,v 1.44.2.45 2000/07/20 05:06:41 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n" +"$Id: dhclient.c,v 1.44.2.47 2000/09/06 20:59:09 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n" "$FreeBSD$\n"; #endif /* not lint */ |
