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/tools/ipf.c | |
| 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/tools/ipf.c')
| -rw-r--r-- | contrib/ipfilter/tools/ipf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ipfilter/tools/ipf.c b/contrib/ipfilter/tools/ipf.c index e9af944..c59bbed4 100644 --- a/contrib/ipfilter/tools/ipf.c +++ b/contrib/ipfilter/tools/ipf.c @@ -21,7 +21,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipf.c 1.23 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)Id: ipf.c,v 1.35.2.3 2004/12/15 18:27:17 darrenr Exp"; +static const char rcsid[] = "@(#)$Id: ipf.c,v 1.35.2.3 2004/12/15 18:27:17 darrenr Exp $"; #endif #if !defined(__SVR4) && defined(__GNUC__) |
