why did you fail us here, my boy mergify

DimitrisJim · DimitrisJim · commit c1e2e5e1fca5 · 2024-10-14T17:18:15.000+03:00
diff --git a/testing/chain.go b/testing/chain.go
@@ -330,11 +330,7 @@ func (chain *TestChain) commitBlock(res *abci.ResponseFinalizeBlock) {
 		Time:               chain.CurrentHeader.Time,
 		ValidatorsHash:     chain.Vals.Hash(),
 		NextValidatorsHash: chain.NextVals.Hash(),
-<<<<<<< HEAD
-		ProposerAddress:    chain.CurrentHeader.ProposerAddress,
-=======
 		ProposerAddress:    chain.Vals.Proposer.Address,
->>>>>>> 64f33e09 (test: update block proposer in testing (#7430))
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -330,11 +330,7 @@ func (chain TestChain) commitBlock(res abci.ResponseFinalizeBlock) {`
`330`	`330`	`Time: chain.CurrentHeader.Time,`
`331`	`331`	`ValidatorsHash: chain.Vals.Hash(),`
`332`	`332`	`NextValidatorsHash: chain.NextVals.Hash(),`
`333`		`-<<<<<<< HEAD`
`334`		`- ProposerAddress: chain.CurrentHeader.ProposerAddress,`
`335`		`-=======`
`336`	`333`	`ProposerAddress: chain.Vals.Proposer.Address,`
`337`		`->>>>>>> 64f33e09 (test: update block proposer in testing (#7430))`
`338`	`334`	`}`
`339`	`335`	`}`
`340`	`336`