Fix merge conflict bug; Update PENDING

cosmos · Nov 5, 2018 · f4338d6 · f4338d6
1 parent 5b74e1d
commit f4338d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
 

diff --git 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