Merge branch 'main' of https://github.com/Sbazar-GmbH/dify

Sbazar-GmbH · Sep 10, 2024 · 22bfc15 · 22bfc15
2 parents 2c29a7b + eeb8622
commit 22bfc15
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -536,7 +536,6 @@ services:
     ports:
       - ${MYSCALE_PORT:-8123}:${MYSCALE_PORT:-8123}
 
-<<<<<<< HEAD
   # https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html
   # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-prod-prerequisites
   elasticsearch: