mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-01-27 18:33:31 +01:00
fix merge conflicts
This commit is contained in:
@@ -263,6 +263,7 @@ base:
|
||||
- ca
|
||||
- ssl
|
||||
- common
|
||||
- nginx
|
||||
- telegraf
|
||||
- firewall
|
||||
{%- if WAZUH != 0 %}
|
||||
|
||||
Reference in New Issue
Block a user