Skip to content

Commit

Permalink
Fix conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Dhwanil Patel <[email protected]>
  • Loading branch information
dhwanilpatel committed Oct 18, 2023
1 parent 03167ad commit 5d09048
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5d09048

Please sign in to comment.