MNT: README

Signed-off-by: George Chen <[email protected]>
opensearch-project · Jul 25, 2023 · cabce61 · cabce61
1 parent 0d17a88
commit cabce61
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/data-prepper-plugins/opensearch/README.md b/data-prepper-plugins/opensearch/README.md
@@ -209,11 +209,7 @@ With the `document_root_key` set to `status`. The document structure would be `{
     duration: "15 ms"
 }
 ```
-<<<<<<< HEAD
-- `backend_version`: A String indicating whether the sink backend version is Elasticsearch 6 or above (i.e. Elasticsearch 7.x or OpenSearch). `es_6` represents Elasticsearch 6; `null` represents Elasticsearch 7.x or OpenSearch. Default to `null`.
-=======
 - `distribution_version`: A String indicating whether the sink backend version is Elasticsearch 6 or above (i.e. Elasticsearch 7.x or OpenSearch). `es6` represents Elasticsearch 6; `default` represents latest compatible backend version (Elasticsearch 7.x, OpenSearch 1.x, OpenSearch 2.x). Default to `default`.
->>>>>>> main
 
 ### <a name="aws_configuration">AWS Configuration</a>