gofmt

cmd/ethereum/blocktest.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/codegangsta/cli"
 	"github.com/ethereum/go-ethereum/cmd/utils"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/tests"
 )
 

tests/blocktest.go

@@ -146,8 +146,6 @@ func (t *BlockTest) ValidatePostState(statedb *state.StateDB) error {
 		if nonce2 != nonce {
 			return fmt.Errorf("account nonce mismatch, addr, found, expected: ", addrString, nonce2, nonce)
 		}
-
->>>>>>> Add validation of post state accounts to block tests
 	}
 	return nil
 }