From 7e6451a528ee63cacaecb868b15b02f551b58795 Mon Sep 17 00:00:00 2001 From: drklee3 Date: Fri, 17 Nov 2023 14:06:00 -0800 Subject: [PATCH] Fix changelog unhandled merge conflict (#1772) --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d565867..10f1b75c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -287,13 +287,10 @@ the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.38.4/CHANGELOG.md). - [#257](https://github.com/Kava-Labs/kava/pulls/257) Include scripts to run large-scale simulations remotely using aws-batch -<<<<<<< HEAD -======= [#1770]: https://github.com/Kava-Labs/kava/pull/1770 [#1755]: https://github.com/Kava-Labs/kava/pull/1755 [#1761]: https://github.com/Kava-Labs/kava/pull/1761 [#1752]: https://github.com/Kava-Labs/kava/pull/1752 ->>>>>>> 39146747 (fix: update ledger-cosmos-go v0.13.1 to resolve signing error with cosmos ledger app 2.34.12 (#1770)) [#1751]: https://github.com/Kava-Labs/kava/pull/1751 [#1669]: https://github.com/Kava-Labs/kava/pull/1669 [#1668]: https://github.com/Kava-Labs/kava/pull/1668