summaryrefslogtreecommitdiffstats
path: root/contrib/ipfilter/lib/parse.c
diff options
context:
space:
mode:
authorguido <guido@FreeBSD.org>2005-12-30 11:52:26 +0000
committerguido <guido@FreeBSD.org>2005-12-30 11:52:26 +0000
commit7ee09247502caaf9063c5d6ba733231a70de09ef (patch)
tree9209f38a8bc3af0186363bc8bbfe05d79337f8d4 /contrib/ipfilter/lib/parse.c
parent3cc29e6ebff10906cf1f84a6cc2d518dcecf219c (diff)
downloadFreeBSD-src-7ee09247502caaf9063c5d6ba733231a70de09ef.zip
FreeBSD-src-7ee09247502caaf9063c5d6ba733231a70de09ef.tar.gz
Resolve conflicts (and believe me...you don't want to know).
Diffstat (limited to 'contrib/ipfilter/lib/parse.c')
-rw-r--r--contrib/ipfilter/lib/parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ipfilter/lib/parse.c b/contrib/ipfilter/lib/parse.c
index 30fc117..8bb121c 100644
--- a/contrib/ipfilter/lib/parse.c
+++ b/contrib/ipfilter/lib/parse.c
@@ -5,7 +5,7 @@
*
* See the IPFILTER.LICENCE file for details on licencing.
*
- * Id: parse.c,v 1.34.2.1 2004/12/09 19:41:21 darrenr Exp
+ * $Id: parse.c,v 1.34.2.1 2004/12/09 19:41:21 darrenr Exp $
*/
#include <ctype.h>
#include "ipf.h"
OpenPOWER on IntegriCloud