resolving merge conflicts

This commit is contained in:
vcerenu
2023-07-11 11:21:00 -03:00
8 changed files with 21 additions and 15 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.5.1
### Added
- Update Wazuh to version [4.5.1](https://github.com/wazuh/wazuh/blob/v4.5.1/CHANGELOG.md#v451)
## Wazuh Docker v4.5.0
### Added