From 559ecd23b600308f045adfc6174eff1c0524e1b9 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <matthias@mttsch.dev>
Date: Fri, 13 Mar 2026 07:38:41 +0100
Subject: [PATCH] Remove git merge conflict marker from code example

---
 core/elasticsearch.md | 1 -
 1 file changed, 1 deletion(-)

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"
 ```