Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SendToModuleAccountTest (bp #8857) #8860

Merged
merged 2 commits into from
Mar 11, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 11, 2021

This is an automatic backport of pull request #8857 done by Mergify.

Cherry-pick of 280ee4f has failed:

On branch mergify/bp/release/v0.42.x/pr-8857
Your branch is up to date with 'origin/release/v0.42.x'.

You are currently cherry-picking commit 280ee4f15.
  (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/handler_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/bank/app_test.go

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

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 you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit 280ee4f)

# Conflicts:
#	x/bank/app_test.go
@alessio alessio requested a review from robert-zaremba March 11, 2021 16:18
@alessio alessio added this to the v0.42.2 milestone Mar 11, 2021
@alessio alessio removed the conflicts label Mar 11, 2021
@alessio alessio merged commit c6462e6 into release/v0.42.x Mar 11, 2021
@alessio alessio deleted the mergify/bp/release/v0.42.x/pr-8857 branch March 11, 2021 18:11
@orijbot
Copy link

orijbot commented Mar 11, 2021

@orijbot
Copy link

orijbot commented Mar 11, 2021

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants