Resolving conflicts in merge

This commit is contained in:
vcerenu
2021-11-16 12:54:49 -03:00
16 changed files with 50 additions and 45 deletions
+5 -1
View File
@@ -1,6 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.3.0
### Added
- Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
## Wazuh Docker v4.2.5
### Added
@@ -11,7 +16,6 @@ All notable changes to this project will be documented in this file.
- Update Wazuh to version [4.2.4](https://github.com/wazuh/wazuh/blob/v4.2.4/CHANGELOG.md#v424)
## Wazuh Docker v4.2.3
### Added