Commit 475d9388 authored by Micah Anderson's avatar Micah Anderson

fixup some merge gaffs

parent d3eb5ffc
......@@ -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
......
......@@ -16,7 +16,7 @@ class shorewall(
}
}
default: {
notice "unknown operatingsystem: $operatingsystem"
notice "unknown operatingsystem: ${::operatingsystem}"
include shorewall::base
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment