From: hno <>
Date: Sun, 1 Sep 2002 20:14:16 +0000 (+0000)
Subject: Fixed a merge conflict when makin via --disable-http-violations dependent
X-Git-Tag: SQUID_3_0_PRE1~796
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d5c0862c831712d9181632ee7f985dd628bb7ef;p=thirdparty%2Fsquid.git

Fixed a merge conflict when makin via --disable-http-violations dependent
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 91ba0957c9..f53268db2d 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.279 2002/09/01 13:46:55 hno Exp $
+# $Id: cf.data.pre,v 1.280 2002/09/01 14:14:16 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -2734,7 +2734,9 @@ DOC_START
 DOC_END
 
 NAME: via
+IFDEF: HTTP_VIOLATIONS
 COMMENT: on|off
+TYPE: onoff
 DEFAULT: on
 LOC: Config.onoff.via
 DOC_START