diff --git a/core/elasticsearch.md b/core/elasticsearch.md index 30c6f04af5d..89b8abaf7ba 100644 --- a/core/elasticsearch.md +++ b/core/elasticsearch.md @@ -94,7 +94,6 @@ configure SSL verification. This works for both Elasticsearch and OpenSearch. # config/packages/api_platform.yaml api_platform: elasticsearch: -<<<<<<< HEAD hosts: ["%env(ELASTICSEARCH_HOST)%"] ssl_ca_bundle: "/path/to/ca-bundle.crt" ```