diff options
| author | guido <guido@FreeBSD.org> | 2005-12-30 11:52:26 +0000 |
|---|---|---|
| committer | guido <guido@FreeBSD.org> | 2005-12-30 11:52:26 +0000 |
| commit | 7ee09247502caaf9063c5d6ba733231a70de09ef (patch) | |
| tree | 9209f38a8bc3af0186363bc8bbfe05d79337f8d4 /contrib/ipfilter/ipsd | |
| parent | 3cc29e6ebff10906cf1f84a6cc2d518dcecf219c (diff) | |
| download | FreeBSD-src-7ee09247502caaf9063c5d6ba733231a70de09ef.zip FreeBSD-src-7ee09247502caaf9063c5d6ba733231a70de09ef.tar.gz | |
Resolve conflicts (and believe me...you don't want to know).
Diffstat (limited to 'contrib/ipfilter/ipsd')
| -rw-r--r-- | contrib/ipfilter/ipsd/ipsd.c | 2 | ||||
| -rw-r--r-- | contrib/ipfilter/ipsd/ipsdr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/ipfilter/ipsd/ipsd.c b/contrib/ipfilter/ipsd/ipsd.c index 970b47e..ad3dfe2 100644 --- a/contrib/ipfilter/ipsd/ipsd.c +++ b/contrib/ipfilter/ipsd/ipsd.c @@ -34,7 +34,7 @@ #ifndef lint static const char sccsid[] = "@(#)ipsd.c 1.3 12/3/95 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)Id: ipsd.c,v 2.2 2001/06/09 17:09:25 darrenr Exp"; +static const char rcsid[] = "@(#)$Id: ipsd.c,v 2.2 2001/06/09 17:09:25 darrenr Exp $"; #endif extern char *optarg; diff --git a/contrib/ipfilter/ipsd/ipsdr.c b/contrib/ipfilter/ipsd/ipsdr.c index df8b9a8..5a90706 100644 --- a/contrib/ipfilter/ipsd/ipsdr.c +++ b/contrib/ipfilter/ipsd/ipsdr.c @@ -35,7 +35,7 @@ #ifndef lint static const char sccsid[] = "@(#)ipsdr.c 1.3 12/3/95 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)Id: ipsdr.c,v 2.2 2001/06/09 17:09:25 darrenr Exp"; +static const char rcsid[] = "@(#)$Id: ipsdr.c,v 2.2 2001/06/09 17:09:25 darrenr Exp $"; #endif extern char *optarg; |
