Fix merge conflict bug; Update PENDING

2018-11-04 19:42:11 -08:00 · 2018-11-04 19:42:11 -08:00 · f4338d6f75
parent 5b74e1d0b6
commit f4338d6f75
2 changed files with 2 additions and 2 deletions
--- a/PENDING.md
+++ b/PENDING.md
@ -12,7 +12,7 @@ BREAKING CHANGES
  * [simulation] \#2665 only argument to simulation.Invariant is now app

 * Tendermint
-
+  * Upgrade to version 0.26.0

 FEATURES

--- a/store/iavlstore.go
+++ b/store/iavlstore.go
@ -220,7 +220,7 @@ func (st *iavlStore) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
 		}

 		if req.Prove {
-			value, _, err := tree.GetVersionedWithProof(key, res.Height)
+			value, proof, err := tree.GetVersionedWithProof(key, res.Height)
 			if err != nil {
 				res.Log = err.Error()
 				break