From 94598e7b94288701116257aee83dfc9461819cc1 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sat, 21 Sep 2024 10:39:47 +0200 Subject: [PATCH] fix conflicts --- CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c62fd798dadc..39ce4d1d35b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,16 +42,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## Features -<<<<<<< HEAD * (cli) [#20779](https://github.com/cosmos/cosmos-sdk/pull/20779) Added `module-hash-by-height` command to query and retrieve module hashes at a specified blockchain height, enhancing debugging capabilities. * (cli) [#21372](https://github.com/cosmos/cosmos-sdk/pull/21372) Added a `bulk-add-genesis-account` genesis command to add many genesis accounts at once. * (types/collections) [#21724](https://github.com/cosmos/cosmos-sdk/pull/21724) Added `LegacyDec` collection value. -======= -* (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