resolving merge conflicts

This commit is contained in:
vcerenu
2023-07-11 11:21:00 -03:00
8 changed files with 21 additions and 15 deletions
+1
View File
@@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.5.1 | | |
| v4.5.0 | | |
| v4.4.5 | | |
| v4.4.4 | | |