Fixed conflicts

This commit is contained in:
manuasir
2019-06-03 18:59:13 +02:00
8 changed files with 23 additions and 7 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
# For more information https://github.com/elastic/elasticsearch-docker/blob/6.5.4/build/elasticsearch/bin/docker-entrypoint.sh
# For more information https://github.com/elastic/elasticsearch-docker/blob/6.8.0/build/elasticsearch/bin/docker-entrypoint.sh
set -e