resolve merge conflicts from branch 3.9.2_6.8.0

2019-06-17 16:02:12 +02:00
parent 651077e2c7 815039333d
commit c077b496bd
7 changed files with 29 additions and 23 deletions
@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
 ARG FILEBEAT_VERSION=6.8.0
-ARG WAZUH_VERSION=3.9.1-1
+ARG WAZUH_VERSION=3.9.2-1

 ENV API_USER="foo" \
    API_PASS="bar"