Closed mergify[bot] closed 5 months ago
Cherry-pick of 089aff838cfbde80e454d7329fe947e85fbcfdd6 has failed:
On branch mergify/bp/release/v0.48.x/pr-1277
Your branch is up to date with 'origin/release/v0.48.x'.
You are currently cherry-picking commit 089aff838.
(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: baseapp/block_gas_test.go
modified: x/foundation/keeper/internal/genesis.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: CHANGELOG.md
both modified: x/foundation/keeper/internal/genesis_test.go
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
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 69.78%. Comparing base (
647075f
) to head (38d596c
).
Description
Motivation and context
How has this been tested?
Screenshots (if appropriate):
Checklist:
CHANGELOG.md
client/docs/swagger-ui/swagger.yaml
This is an automatic backport of pull request #1277 done by Mergify.