fixup some merge gaffs

diff --git a/files/shorewall.conf.Debian.squeeze b/files/shorewall.conf.Debian.squeeze
index 5c57b043296f2f004dea06e49afb1c02f667cee8..a3b15777cab48b5295c8a34ba5856144fda91594 100644 (file)
--- 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
 

diff --git a/manifests/init.pp b/manifests/init.pp
index 574ac85616b739e23c742de8a7a6b3239e934d55..656f5a1bc6cf03cc7c3df65690761dead35faaff 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,7 +16,7 @@ class shorewall(
       }
     }
     default: {
-      notice "unknown operatingsystem: $operatingsystem" 
+      notice "unknown operatingsystem: ${::operatingsystem}" 
       include shorewall::base
     }
   }