resolving conflicts in 4.3 merge

2022-11-30 15:27:48 -03:00
parent c87580cfb5 6c094d07a6
commit e9a0be25ce
10 changed files with 27 additions and 21 deletions
@@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0         ##

 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
+| v4.4.0        |         |        |
 | v4.3.10       |         |        |
 | v4.3.9        |         |        |
 | v4.3.8        |         |        |