From 47f1ff461a096853ffbbd15b2554c9c289f03607 Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Tue, 18 Jun 2024 21:35:04 +0200 Subject: solve conflict --- docs/configexamples/zone-policy.rst | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docs/configexamples/zone-policy.rst b/docs/configexamples/zone-policy.rst index 764c709b..d0101ebf 100644 --- a/docs/configexamples/zone-policy.rst +++ b/docs/configexamples/zone-policy.rst @@ -5,19 +5,6 @@ Zone-Policy example ------------------- -<<<<<<< HEAD -.. note:: Starting from VyOS 1.4-rolling-202308040557, a new firewall - structure can be found on all vyos instalations, and zone based firewall is - no longer supported. Documentation for most of the new firewall CLI can be - found in the `firewall - `_ - chapter. The legacy firewall is still available for versions before - 1.4-rolling-202308040557 and can be found in the :ref:`legacy-firewall` - chapter. The examples in this section use the legacy firewall configuration - commands, since this feature has been removed in earlier releases. - -======= ->>>>>>> fe416b56 (Configuration Blueprints: add new example for firewall+vrf. Also, add note about usage of inbound and outbound interface when interface is attached to a non-default vrf.) .. note:: In :vytask:`T2199` the syntax of the zone configuration was changed. The zone configuration moved from ``zone-policy zone `` to ``firewall zone ``. -- cgit v1.2.3