Resolving merge conflicts

This commit is contained in:
vcerenu
2025-02-04 08:47:46 -03:00
12 changed files with 298 additions and 39 deletions
+1
View File
@@ -178,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.11.0 | | |
| v4.10.2 | | |
| v4.10.1 | | |
| v4.10.0 | | |