iSharkFly-Docs
/
opensearch-docs-cn
mirror of https://github.com/iSharkFly-Docs/opensearch-docs-cn
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes merge error (#1857) 

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
This commit is contained in:
kolchfa-aws 2022-11-11 12:16:54 -05:00 committed by GitHub
parent 3afe500cd5
commit 1a609464ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_data-prepper/migrate-open-distro.md
View File

@ -1,12 +1,7 @@
---
layout: default
title: Migrating from Open Distro Data Prepper
parent: Data Prepper
<<<<<<< HEAD:_data-prepper/migrate-open-distro.md
nav_order: 11
=======
nav_order: 2
>>>>>>> main:_clients/data-prepper/migrate-open-distro.md
---
# Migrating from Open Distro Data Prepper