imp

cosmos · Jan 6, 2025 · 3afb564 · 3afb564
1 parent 0d5055a
commit 3afb564
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 206 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,19 +40,10 @@ 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.
-* (client/keys) [#21829](https://github.com/cosmos/cosmos-sdk/pull/21829) Add support for importing hex key using standard input.
-* (x/auth/ante) [#23128](https://github.com/cosmos/cosmos-sdk/pull/23128) Allow custom verifyIsOnCurve when validate tx for public key like ethsecp256k1.
-
 ### Improvements
 
 * (codec) [#22988](https://github.com/cosmos/cosmos-sdk/pull/22988) Improve edge case handling for recursion limits.
 
->>>>>>> 93282e101 (refactor: improve edge case handling for recursion limits (#22988))
 ### Bug Fixes
 
 * (x/auth/tx) [#23148](https://github.com/cosmos/cosmos-sdk/pull/23148) Avoid panic from intoAnyV2 when v1.PublicKey is optional.

diff --git a/x/tx/decode/unknown.go b/x/tx/decode/unknown.go