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

refactor(x/mint): remove SetInitialSupplyOffsetDuringMigration keeper method (backport #2418) #2456

Merged
merged 2 commits into from
Aug 19, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 19, 2022

This is an automatic backport of pull request #2418 done by Mergify.
Cherry-pick of 3d7d48c has failed:

On branch mergify/bp/v11.x/pr-2418
Your branch is up to date with 'origin/v11.x'.

You are currently cherry-picking commit 3d7d48c8.
  (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:   app/upgrades/v7/upgrades.go
	modified:   x/mint/keeper/keeper.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/mint/keeper/keeper_test.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


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.com

… method (#2418)

* refactor(x/mint): remove SetInitialSupplyOffsetDuringMigration keeper function

* changelog

* resolve merge conflict

(cherry picked from commit 3d7d48c)

# Conflicts:
#	CHANGELOG.md
#	x/mint/keeper/keeper_test.go
@mergify mergify bot requested a review from a team August 19, 2022 12:39
@mergify mergify bot added the conflicts label Aug 19, 2022
@mergify mergify bot assigned p0mvn Aug 19, 2022
@p0mvn p0mvn merged commit 8bc567d into v11.x Aug 19, 2022
@p0mvn p0mvn deleted the mergify/bp/v11.x/pr-2418 branch August 19, 2022 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants