fix merge conflicts · 8804495491 - tendermint - Gitea: Git with a cup of tea

fix merge conflicts

v0.31

Anton Kaliaev 5 years ago

committed by

Jack Zampolin

parent

87374c9c60

commit

8804495491

1 changed files with 1 additions and 1 deletions

Unified View

							
								+ 1
								
								- 1
							
crypto/merkle/simple_proof.goView File
								
																@ -2,10 +2,10 @@ package merkle
															
																import (
																
																import (
															
																	"bytes"
																
																	"bytes"
															
																	"errors"
																
																	"fmt"
																
																	"fmt"
															
																	"github.com/pkg/errors"
																
																	"github.com/pkg/errors"
															
																	"github.com/tendermint/tendermint/crypto/tmhash"
																
																	"github.com/tendermint/tendermint/crypto/tmhash"
															
																	cmn "github.com/tendermint/tendermint/libs/common"
																
																	cmn "github.com/tendermint/tendermint/libs/common"
															
																)
																
																)