Closed mergify[bot] closed 6 months ago
Cherry-pick of 8cf5abb165fdc46a3cd5665dbfee4769531f5ab8 has failed:
On branch mergify/bp/osmo-v23/v0.47.5-iavl-v1/pr-594
Your branch is up to date with 'origin/osmo-v23/v0.47.5-iavl-v1'.
You are currently cherry-picking commit 8cf5abb16.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: go.mod
modified: go.sum
modified: simapp/go.mod
modified: simapp/go.sum
modified: tests/go.mod
modified: tests/go.sum
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: CHANGELOG.md
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Description
Closes: #XXXX
Bug found when running E2E on Osmosis repo.
Summary by CodeRabbit
This is an automatic backport of pull request #594 done by Mergify.