From 7ee09247502caaf9063c5d6ba733231a70de09ef Mon Sep 17 00:00:00 2001
From: guido <guido@FreeBSD.org>
Date: Fri, 30 Dec 2005 11:52:26 +0000
Subject: Resolve conflicts (and believe me...you don't want to know).

---
 contrib/ipfilter/bpf_filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'contrib/ipfilter/bpf_filter.c')

diff --git a/contrib/ipfilter/bpf_filter.c b/contrib/ipfilter/bpf_filter.c
index f5cc588..730e6f8 100644
--- a/contrib/ipfilter/bpf_filter.c
+++ b/contrib/ipfilter/bpf_filter.c
@@ -42,7 +42,7 @@
 
 #if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
 static const char rcsid[] =
-    "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2 2003/08/19 16:49:58 darrenr Exp $ (LBL)";
+    "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.1 2005/06/18 02:41:30 darrenr Exp $ (LBL)";
 #endif
 
 #include <sys/param.h>
-- 
cgit v1.1