Git conflict markers in file `accounts/abi/abigen/testdata/v2/structs-abi.go.txt`

[sebastianst]

It looks like #31379 has committed file accounts/abi/abigen/testdata/v2/structs-abi.go.txt containing Git conflict markers:

go-ethereum/accounts/abi/abigen/testdata/v2/structs-abi.go.txt

Lines 53 to 62 in 36b2371

	<<<<<<< HEAD
	// Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
	func (c *Structs) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
	return bind.NewBoundContract(addr, c.abi, backend, backend, backend)
	=======
	// Use this to create the instance object passed to abigen v2 library functions Call,
	// Transact, etc.
	func (c *Structs) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
	return bind.NewBoundContract(backend, addr, c.abi)
	>>>>>>> 854c25e086 (accounts/abi/abigen: improve v2 template)

Was that intended? It's surprising that no tests fail because of this.

[jwasinger]

This file should have been removed before merging that PR (the same test-case is in structs.go.txt). It doesn't cause any test failures because the file name doesn't correspond to a test case.