fix semantic merge conflict

Inphi · Inphi · commit 177f16edd0ec · 2022-06-13T12:01:22.000-04:00
diff --git a/core/beacon/types.go b/core/beacon/types.go
@@ -124,7 +124,7 @@ type ForkchoiceStateV1 struct {
 func encodeTransactions(txs []*types.Transaction) [][]byte {
 	var enc = make([][]byte, len(txs))
 	for i, tx := range txs {
-		enc[i], _ = tx.MarshalBinary()
+		enc[i], _ = tx.MarshalMinimal()
 	}
 	return enc
 }

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ type ForkchoiceStateV1 struct {`
`124`	`124`	`func encodeTransactions(txs []*types.Transaction) [][]byte {`
`125`	`125`	`var enc = make([][]byte, len(txs))`
`126`	`126`	`for i, tx := range txs {`
`127`		`- enc[i], _ = tx.MarshalBinary()`
	`127`	`+ enc[i], _ = tx.MarshalMinimal()`
`128`	`128`	`}`
`129`	`129`	`return enc`
`130`	`130`	`}`