Fix conflicts.
This commit is contained in:
parent
08ff2f1888
commit
b0a0801243
@ -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 */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user