From 88044954914d9b65cdfe723754cb6b702f053fc2 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Thu, 17 Oct 2019 18:08:36 -0500 Subject: [PATCH] fix merge conflicts --- crypto/merkle/simple_proof.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/merkle/simple_proof.go b/crypto/merkle/simple_proof.go index fa4fefb63..a2da9fe0a 100644 --- a/crypto/merkle/simple_proof.go +++ b/crypto/merkle/simple_proof.go @@ -2,10 +2,10 @@ package merkle import ( "bytes" - "errors" "fmt" "github.com/pkg/errors" + "github.com/tendermint/tendermint/crypto/tmhash" cmn "github.com/tendermint/tendermint/libs/common" )