Fixes merge error (opensearch-project#1857)

Signed-off-by: Fanit Kolchina <[email protected]> Signed-off-by: Fanit Kolchina <[email protected]>
partlov · Nov 11, 2022 · 1a60946 · 1a60946
1 parent 3afe500
commit 1a60946
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/_data-prepper/migrate-open-distro.md b/_data-prepper/migrate-open-distro.md
@@ -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