resolving merge conflicts

This commit is contained in:
vcerenu
2023-07-11 12:17:06 -03:00
15 changed files with 241 additions and 22 deletions
+5
View File
@@ -1,6 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.7.0
### Added
- Update Wazuh to version [4.7.0](https://github.com/wazuh/wazuh/blob/v4.7.0/CHANGELOG.md#v470)
## Wazuh Docker v4.6.0
### Added