From 3e8a69bb37682d91e187b3602798395ca6425454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Thu, 18 May 2023 12:18:53 -0300
Subject: [PATCH] Conflicts resolution

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

diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
index 92e81303..865161fc 100644
--- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
@@ -1,10 +1,5 @@
 ---
-<<<<<<< HEAD
-
-wazuh_agent_version: 4.4.2
-=======
 wazuh_agent_version: 4.5.0
->>>>>>> 4.5
 
 # Custom packages installation
 
@@ -16,11 +11,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
 
 wazuh_agent_sources_installation:
   enabled: false
-<<<<<<< HEAD
-  branch: "v4.4.2"
-=======
   branch: "v4.5.0"
->>>>>>> 4.5
   user_language: "y"
   user_no_stop: "y"
   user_install_type: "agent"