From 13058608caa68eb17c5f10a461311815254affd0 Mon Sep 17 00:00:00 2001 From: Robert Pirtle Date: Fri, 25 Aug 2023 15:55:27 -0700 Subject: [PATCH] fix changlog conflicts --- CHANGELOG.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 195c2fc897..d06f750f3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -255,13 +255,8 @@ 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 -[#1668]: https://github.com/Kava-Labs/kava/pull/1668 -<<<<<<< HEAD -======= [#1669]: https://github.com/Kava-Labs/kava/pull/1669 -[#1655]: https://github.com/Kava-Labs/kava/pull/1655 -[#1624]: https://github.com/Kava-Labs/kava/pull/1624 ->>>>>>> 8b6bbd36 (feat(metrics): add timing metrics to abci methods (#1669)) +[#1668]: https://github.com/Kava-Labs/kava/pull/1668 [#1631]: https://github.com/Kava-Labs/kava/pull/1631 [#1622]: https://github.com/Kava-Labs/kava/pull/1622 [#1568]: https://github.com/Kava-Labs/kava/pull/1568