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

Remove duplicate denom-authority-metadata query command (backport #4819) #5355

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 30, 2023

This is an automatic backport of pull request #4819 done by Mergify.
Cherry-pick of 50b26a8 has failed:

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

You are currently cherry-picking commit 50b26a87.
  (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/tokenfactory/client/cli/query.go

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/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

* remove duplicate denom-authority-metadata query command

* merge main

* revert change

* revert change

* fix lint

* add GetCmdDenomsFromCreator and CHANGELOG

---------

Co-authored-by: Jacob Gadikian <[email protected]>
(cherry picked from commit 50b26a8)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label May 30, 2023
@p0mvn p0mvn closed this May 30, 2023
@mergify mergify bot deleted the mergify/bp/v15.x/pr-4819 branch May 30, 2023 04:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants