Resolved Conflicts

base/github/securitygroups-load-balancers.tf

@@ -27,7 +27,6 @@ locals {
   # Locking down sources on 2021-12-10 due to log4j vulnerability
   #allowed_sources = local.zscalar_cidrs
   #allowed_sources = concat(var.trusted_ips, local.zscalar_cidrs)
-  # salt masters only for the weekend
   allowed_sources = concat(local.zscalar_cidrs, var.trusted_ips, local.salt_masters)
   #allowed_sources = [ "0.0.0.0/0" ]
 }