From 6ae523e3d8b14cd4ddfee9db3ee0428ea99cf6b1 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sat, 21 Sep 2024 10:41:59 +0200 Subject: [PATCH] fix conflicts --- CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4c8f2825137..5d2849261318 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,15 +42,9 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i ### Features -<<<<<<< HEAD * (x/validate) [#21822](https://github.com/cosmos/cosmos-sdk/pull/21822) New module solely responsible for providing ante/post handlers and tx validators for v2. It can be extended by the app developer to provide extra tx validators. * In comparison to x/auth/tx/config, there is no app config to skip ante/post handlers, as overwriting them in baseapp or not injecting the x/validate module has the same effect. -======= -* (baseapp) [#20291](https://github.com/cosmos/cosmos-sdk/pull/20291) Simulate nested messages. -* (cli) [#21372](https://github.com/cosmos/cosmos-sdk/pull/21372) Add a `bulk-add-genesis-account` genesis command to add many genesis accounts at once. * (crypto/keyring) [#21653](https://github.com/cosmos/cosmos-sdk/pull/21653) New Linux-only backend that adds Linux kernel's `keyctl` support. -* (runtime) [#21704](https://github.com/cosmos/cosmos-sdk/pull/21704) Add StoreLoader in simappv2. ->>>>>>> c0eced8d7 (feat(crypto/keyring): add Linux's keyctl support (#21653)) ### Improvements