diff options
| author | Guido van Rooij <guido@FreeBSD.org> | 2005-12-30 11:52:26 +0000 |
|---|---|---|
| committer | Guido van Rooij <guido@FreeBSD.org> | 2005-12-30 11:52:26 +0000 |
| commit | 25508d6cfbafa0e186ef2b9a5b8fc683b1aef865 (patch) | |
| tree | 9209f38a8bc3af0186363bc8bbfe05d79337f8d4 /contrib/ipfilter/ipsd/ipsdr.c | |
| parent | d362c40d3a43c5e377ec90dd140a98e109e6b285 (diff) | |
| download | src-25508d6cfbafa0e186ef2b9a5b8fc683b1aef865.tar.gz src-25508d6cfbafa0e186ef2b9a5b8fc683b1aef865.zip | |
Resolve conflicts (and believe me...you don't want to know).
Notes
Notes:
svn path=/head/; revision=153881
Diffstat (limited to 'contrib/ipfilter/ipsd/ipsdr.c')
| -rw-r--r-- | contrib/ipfilter/ipsd/ipsdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ipfilter/ipsd/ipsdr.c b/contrib/ipfilter/ipsd/ipsdr.c index df8b9a88afa5..5a907061c631 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; |