Skip to content

Commit 4667971

Browse files
authored
Remove git merge conflict marker from code example (#2265)
1 parent 4f0fb2a commit 4667971

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

core/elasticsearch.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ configure SSL verification. This works for both Elasticsearch and OpenSearch.
9494
# config/packages/api_platform.yaml
9595
api_platform:
9696
elasticsearch:
97-
<<<<<<< HEAD
9897
hosts: ["%env(ELASTICSEARCH_HOST)%"]
9998
ssl_ca_bundle: "/path/to/ca-bundle.crt"
10099
```

0 commit comments

Comments
 (0)