diff options
| author | Micah Anderson <micah@riseup.net> | 2012-06-20 13:39:20 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-06-20 13:39:20 -0400 |
| commit | 475d93888ff853d48b6f4cdcc894415026553abe (patch) | |
| tree | 206039e5e8acbf15be4900e8f5594bc47c3d2169 /files | |
| parent | d3eb5ffc325bd13e103dc72143f78c050e149d29 (diff) | |
fixup some merge gaffs
Diffstat (limited to 'files')
| -rw-r--r-- | files/shorewall.conf.Debian.squeeze | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/files/shorewall.conf.Debian.squeeze b/files/shorewall.conf.Debian.squeeze index 5c57b04..a3b1577 100644 --- a/files/shorewall.conf.Debian.squeeze +++ b/files/shorewall.conf.Debian.squeeze @@ -121,7 +121,7 @@ CLAMPMSS=No ROUTE_FILTER=Yes DETECT_DNAT_IPADDRS=No -======= + MARK_IN_FORWARD_CHAIN=Yes CLAMPMSS=No @@ -129,7 +129,6 @@ CLAMPMSS=No ROUTE_FILTER=No DETECT_DNAT_IPADDRS=YES ->>>>>>> immerda/master MUTEX_TIMEOUT=60 |