changelog

cosmos · Sep 13, 2024 · f6c5007 · f6c5007
1 parent 4a55e5a
commit f6c5007
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,11 +45,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
-<<<<<<< HEAD
 * (x/bank) [#21460](https://github.com/cosmos/cosmos-sdk/pull/21460) Added `Sender` attribute in `MsgMultiSend` event.
-=======
 * (genutil) [#21701](https://github.com/cosmos/cosmos-sdk/pull/21701) Improved error messages for genesis validation.
->>>>>>> 9c5cea08c (feat(x/genutil): add better error messages for genesis validation (#21701))
 
 ### Bug Fixes