Gonzalo Acuña 3e8a69bb37 Conflicts resolution		2023-05-18 12:18:53 -03:00
..
ansible-filebeat-oss	Conflicts resolved	2023-02-01 10:47:03 -03:00
ansible-wazuh-agent	Conflicts resolution	2023-05-18 12:18:53 -03:00
ansible-wazuh-manager	Conflicts resolved	2023-02-01 10:47:03 -03:00
check-packages	merge 4.4 to 4.5	2023-04-28 16:35:27 -03:00
vars	Conflicts resolved	2023-02-01 10:47:03 -03:00
wazuh-dashboard	Conflicts resolved	2023-02-01 10:47:03 -03:00
wazuh-indexer	Conflicts resolved	2023-02-01 10:47:03 -03:00