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
+1
View File
@@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.7.0 | | |
| v4.6.0 | | |
| v4.5.1 | | |
| v4.5.0 | | |