Fix merge conflict typo in Data Prepper (#1836)

This commit is contained in:
Naarcha-AWS 2022-11-08 15:01:21 -06:00 committed by GitHub
parent 71608d4ba6
commit d8ff91b9f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions

View File

@ -2,12 +2,9 @@
layout: default
title: Configure Logstash for Data Prepper
parent: Data Prepper
<<<<<<< HEAD:_data-prepper/configure-logstash-data-prepper.md
nav_order: 12
=======
nav_order: 2
>>>>>>> main:_clients/data-prepper/configure-logstash-data-prepper.md
---
# Configure Logstash for Data Prepper
You can run Data Prepper with a Logstash configuration.
@ -45,4 +42,4 @@ The following output in your terminal indicates that Data Prepper is running cor
```
INFO org.opensearch.dataprepper.pipeline.ProcessWorker - log-pipeline Worker: No records received from buffer
```
```