From b2dcdeb0f367bbdf39fbc50849a367126c4e419a Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 16 Aug 2024 10:44:38 +0200 Subject: [PATCH] Update CHANGELOG.md --- CHANGELOG.md | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e91384f42a9..842635e278ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,22 +40,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ Every module contains its own CHANGELOG.md. Please refer to the module you are interested in. -<<<<<<< HEAD -======= -### Features - -* (baseapp) [#20291](https://github.com/cosmos/cosmos-sdk/pull/20291) Simulate nested messages. - -### Improvements - -### Bug Fixes - -* (baseapp) [#21256](https://github.com/cosmos/cosmos-sdk/pull/21256) Halt height will not commit the block indicated, meaning that if halt-height is set to 10, only blocks until 9 (included) will be committed. This is to go back to the original behavior before a change was introduced in v0.50.0. - - -### API Breaking Changes - ->>>>>>> e2ec889bb (fix(baseapp)!: Halt at height now does not produce the halt height block (#21256)) ## [v0.52.0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.52.0) - 2024-XX-XX Every module contains its own CHANGELOG.md. Please refer to the module you are interested in.