resolving conflicts

This commit is contained in:
vcerenu 2023-11-14 04:26:21 -03:00
parent b4a1165176
commit bcce084cdb
No known key found for this signature in database
GPG Key ID: 4D7B159107F1244A

View File

@ -1,7 +1,2 @@
<<<<<<< HEAD
WAZUH-ANSIBLE_VERSION="v4.7.0"
REVISION="40703"
=======
WAZUH-ANSIBLE_VERSION="v4.7.1"
REVISION="40705"
>>>>>>> 018da92c8c21f9d194729532c6b042bc1be4dee7