fix changlog conflicts

Kava-Labs · Aug 25, 2023 · 1305860 · 1305860
1 parent 7ca86f3
commit 1305860
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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