conflicts

cosmos · Oct 3, 2024 · ff0e4c8 · ff0e4c8
1 parent 09bf0ff
commit ff0e4c8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/x/auth/migrations/legacytx/stdtx_test.go b/x/auth/migrations/legacytx/stdtx_test.go
@@ -44,11 +44,7 @@ func TestStdSignBytes(t *testing.T) {
 		Amount:   []*basev1beta1.Coin{{Denom: "atom", Amount: "150"}},
 		GasLimit: 100000,
 	}
-<<<<<<< HEAD
 	msgStr := fmt.Sprintf(`{"type":"testpb/TestMsg","value":{"signers":["%s"]}}`, addr)
-=======
-	msgStr := fmt.Sprintf(`{"type":"testpb/TestMsg","value":{"decField":"0.000000000000000000","signers":["%s"]}}`, addr)
->>>>>>> 2d40cc1ab (fix(x/tx): fix amino json drift from legacy spec (#21825))
 	tests := []struct {
 		name string
 		args args