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/lib/addipopt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'contrib/ipfilter/lib/addipopt.c')

diff --git a/contrib/ipfilter/lib/addipopt.c b/contrib/ipfilter/lib/addipopt.c
index e775184..6dc7f48 100644
--- a/contrib/ipfilter/lib/addipopt.c
+++ b/contrib/ipfilter/lib/addipopt.c
@@ -5,7 +5,7 @@
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * Id: addipopt.c,v 1.7 2002/01/28 06:50:45 darrenr Exp
+ * $Id: addipopt.c,v 1.7 2002/01/28 06:50:45 darrenr Exp $
  */
 
 #include "ipf.h"
-- 
cgit v1.1