From f4ee80f10f4e9f50cb206f59d57550c71b7df5bf Mon Sep 17 00:00:00 2001
From: Nicolas Lastra <lastra.nikos@gmail.com>
Date: Thu, 21 Oct 2021 10:36:00 -0300
Subject: [PATCH] resolve merge conflicts

---
 roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
index 4b7f02b0..300c7c93 100644
--- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
@@ -1,8 +1,4 @@
 ---
-<<<<<<< HEAD
-=======
-wazuh_agent_version: 4.2.4-1
->>>>>>> 4.2
 
 wazuh_agent_version: 4.3.0-1
 
@@ -16,11 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
 
 wazuh_agent_sources_installation:
   enabled: false
-<<<<<<< HEAD
   branch: "v4.3.0"
-=======
-  branch: "v4.2.4"
->>>>>>> 4.2
   user_language: "y"
   user_no_stop: "y"
   user_install_type: "agent"