fix conflicts

cosmos · Oct 11, 2024 · 73afbf7 · 73afbf7
1 parent b51d8bd
commit 73afbf7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/tests/integration/tx/aminojson/aminojson_test.go b/tests/integration/tx/aminojson/aminojson_test.go
@@ -1,12 +1,8 @@
 package aminojson
 
 import (
-<<<<<<< HEAD
 	"context"
-=======
-	"bytes"
 	"encoding/json"
->>>>>>> 60cbe2db2 (fix(x/tx): sort with oneof field name in amino-json (#21782))
 	"fmt"
 	"reflect"
 	"testing"

diff --git a/x/tx/CHANGELOG.md b/x/tx/CHANGELOG.md
@@ -33,13 +33,10 @@ Since v0.13.0, x/tx follows Cosmos SDK semver: https://github.com/cosmos/cosmos-
 
 ## [Unreleased]
 
-<<<<<<< HEAD
-=======
+### Bug Fixes
+
 * [#21782](https://github.com/cosmos/cosmos-sdk/pull/21782) Fix JSON attribute sort order on messages with oneof fields.
-* [#21825](https://github.com/cosmos/cosmos-sdk/pull/21825) Fix decimal encoding and field ordering in Amino JSON encoder.
-* [#21850](https://github.com/cosmos/cosmos-sdk/pull/21850) Support bytes field as signer.
 
->>>>>>> 60cbe2db2 (fix(x/tx): sort with oneof field name in amino-json (#21782))
 ## [v0.13.5](https://github.com/cosmos/cosmos-sdk/releases/tag/x/tx/v0.13.5) - 2024-09-18
 
 ### Improvements