resolving conflicts

This commit is contained in:
vcerenu
2023-10-23 05:02:02 -03:00
20 changed files with 237 additions and 39 deletions
+1
View File
@@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.6.0 | | |
| v4.5.4 | | |
| v4.5.3 | | |
| v4.5.2 | | |