Resolve conflicts

This commit is contained in:
vcerenu
2024-10-17 13:04:31 -03:00
35 changed files with 839 additions and 630 deletions
+1 -1
View File
@@ -168,7 +168,6 @@ WAZUH_MONITORING_REPLICAS=0 ##
└── VERSION
## Branches
* `master` branch contains the latest code, be aware of possible bugs on this branch.
@@ -178,6 +177,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v5.0.0 | | |
| v4.10.2 | | |
| v4.10.1 | | |
| v4.10.0 | | |