From 601616c022d938d39eeeab26673f01a6f7238bf3 Mon Sep 17 00:00:00 2001
From: Bjarke Istrup Pedersen <gurli@gurlinet.dk>
Date: Sat, 9 Dec 2023 17:22:16 +0100
Subject: T5775: Fix collisions and adjust for 1.4

---
 data/templates/firewall/nftables.j2 | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'data/templates/firewall/nftables.j2')

diff --git a/data/templates/firewall/nftables.j2 b/data/templates/firewall/nftables.j2
index 133835d54..3f7906628 100644
--- a/data/templates/firewall/nftables.j2
+++ b/data/templates/firewall/nftables.j2
@@ -167,10 +167,7 @@ table ip vyos_filter {
 {{ group_tmpl.groups(group, False, True) }}
 
 {% if zone is vyos_defined %}
-<<<<<<< HEAD
-{{ zone_tmpl.zone_chains(zone, False) }}
-=======
-{{ zone_tmpl.zone_chains(zone, 'ipv4', global_options.state_policy is vyos_defined) }}
+{{ zone_tmpl.zone_chains(zone, False, global_options.state_policy is vyos_defined) }}
 {% endif %}
 {% if global_options.state_policy is vyos_defined %}
     chain VYOS_STATE_POLICY {
@@ -185,7 +182,6 @@ table ip vyos_filter {
 {%     endif %}
         return
     }
->>>>>>> 64ee13cf9 (T5775: firewall: re-add state-policy to firewall. These commands are now included in <set firewall global-options state-policy> node.)
 {% endif %}
 }
 
@@ -307,10 +303,7 @@ table ip6 vyos_filter {
 {{ group_tmpl.groups(group, True, True) }}
 
 {% if zone is vyos_defined %}
-<<<<<<< HEAD
-{{ zone_tmpl.zone_chains(zone, True) }}
-=======
-{{ zone_tmpl.zone_chains(zone, 'ipv6', global_options.state_policy is vyos_defined) }}
+{{ zone_tmpl.zone_chains(zone, True, global_options.state_policy is vyos_defined) }}
 {% endif %}
 {% if global_options.state_policy is vyos_defined %}
     chain VYOS_STATE_POLICY6 {
@@ -325,7 +318,6 @@ table ip6 vyos_filter {
 {%     endif %}
         return
     }
->>>>>>> 64ee13cf9 (T5775: firewall: re-add state-policy to firewall. These commands are now included in <set firewall global-options state-policy> node.)
 {% endif %}
 
 }
-- 
cgit v1.2.3