manuasir 5d1432b729 Fixed conflicts

2019-06-03 18:59:13 +02:00

..

entrypoint.sh

Correct copyright header

2019-05-14 15:01:19 +02:00

kibana_settings.sh

Fixed conflicts

2019-06-03 18:59:13 +02:00

wazuh_app_config.sh

Correct copyright header

2019-05-14 15:01:19 +02:00

welcome_wazuh.sh

Correct copyright header

2019-05-14 15:01:19 +02:00

xpack_config.sh

Correct copyright header

2019-05-14 15:01:19 +02:00