mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-07-19 22:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Anton Kaliaev
2019-10-17 18:08:36 -05:00
committed by Jack Zampolin
parent 87374c9c60
commit 8804495491
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/merkle/simple_proof.go
+1 -1
View File
@@ -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"
)