From 5d09048e61ac683ab0f0a25c68c3cb9a0058a7c0 Mon Sep 17 00:00:00 2001 From: Dhwanil Patel Date: Wed, 18 Oct 2023 12:04:32 +0530 Subject: [PATCH] Fix conflicts Signed-off-by: Dhwanil Patel --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5635fe823c8a9..243423223ca52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -122,8 +122,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Security [Unreleased 3.0]: https://github.com/opensearch-project/OpenSearch/compare/2.x...HEAD -<<<<<<< HEAD -[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.11...2.x -======= [Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.12...2.x ->>>>>>> upstream/main