Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
This PR is a forward-port of #9392 from `release/v0.42.x` to `master`. It was initially decided in #9392 (comment) that #9392 would be a temporary fix for 0.42, but as per @AdityaSripal's request we're actually foward-porting this to master too. ## Mergify description: This is an automatic backport of pull request #9392 done by [Mergify](https://mergify.io). Cherry-pick of 3776793 has failed: ``` On branch mergify/bp/master/pr-9392 Your branch is up to date with 'origin/master'. You are currently cherry-picking commit 3776793. (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: x/bank/simulation/params.go modified: x/capability/keeper/keeper.go Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) deleted by us: x/ibc/applications/transfer/simulation/params.go ``` To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.io/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.io/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.io/ </details>
- Loading branch information