diff options
| author | guido <guido@FreeBSD.org> | 2006-08-16 12:23:02 +0000 |
|---|---|---|
| committer | guido <guido@FreeBSD.org> | 2006-08-16 12:23:02 +0000 |
| commit | e49049679f4ee5ce6bb9214122154c529a811b5e (patch) | |
| tree | 435ea094ad0e55736442383de5885c9c40c9d2a2 /contrib/ipfilter/ipt.h | |
| parent | fcfb8e57499dfda26645e92a1b5ad74c6f35ee92 (diff) | |
| download | FreeBSD-src-e49049679f4ee5ce6bb9214122154c529a811b5e.zip FreeBSD-src-e49049679f4ee5ce6bb9214122154c529a811b5e.tar.gz | |
Resolve conflicts
MFC after: 1 weeks
Diffstat (limited to 'contrib/ipfilter/ipt.h')
| -rw-r--r-- | contrib/ipfilter/ipt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ipfilter/ipt.h b/contrib/ipfilter/ipt.h index 958c465..f3074a8 100644 --- a/contrib/ipfilter/ipt.h +++ b/contrib/ipfilter/ipt.h @@ -5,7 +5,7 @@ * * See the IPFILTER.LICENCE file for details on licencing. * - * $Id: ipt.h,v 2.6 2003/02/16 02:33:09 darrenr Exp $ + * $Id: ipt.h,v 2.6.4.2 2006/03/26 23:42:04 darrenr Exp $ */ #ifndef __IPT_H__ |
