From 794222dc821ae58c2a37aba5d3c904616a4fd5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Mon, 25 Jul 2022 08:07:06 -0300 Subject: [PATCH] Conflicts 4.3.6 --- roles/wazuh/wazuh-dashboard/vars/debian.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index de72d4ec..92f47d64 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,7 +1,3 @@ --- -<<<<<<< HEAD -dashboard_version: 4.3.6 -======= dashboard_version: 4.5.0 ->>>>>>> master