resolving merge conflicts

This commit is contained in:
vcerenu
2023-07-11 09:41:16 -03:00
12 changed files with 28 additions and 22 deletions
+1
View File
@@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.5.0 | | |
| v4.4.5 | | |
| v4.4.4 | | |
| v4.4.3 | | |