fix merge conflicts

This commit is contained in:
m0duspwnens
2020-05-29 17:31:07 -04:00
2 changed files with 3 additions and 1 deletions

View File

@@ -263,6 +263,7 @@ base:
- ca
- ssl
- common
- nginx
- telegraf
- firewall
{%- if WAZUH != 0 %}