Resolving merge conflicts

This commit is contained in:
vcerenu
2025-02-04 09:31:51 -03:00
17 changed files with 51 additions and 42 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.11.0
- 4.12.0
port:
tcp:1514:
listening: true