resolving conflicts

This commit is contained in:
vcerenu
2023-10-23 05:39:31 -03:00
19 changed files with 101 additions and 32 deletions
+1
View File
@@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.8.0 | | |
| v4.7.1 | | |
| v4.7.0 | | |
| v4.6.0 | | |