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

chore: update TM dep + go.mod cleanup (backport #175) #180

Merged
merged 2 commits into from
Apr 8, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 8, 2022

This is an automatic backport of pull request #175 done by Mergify.
Cherry-pick of 772e828 has failed:

On branch mergify/bp/v0.45.0x-osmo-v7/pr-175
Your branch is up to date with 'origin/v0.45.0x-osmo-v7'.

You are currently cherry-picking commit 772e82855.
  (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:   go.sum
	modified:   server/tm_cmds.go
	modified:   server/util.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

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

(cherry picked from commit 772e828)

# Conflicts:
#	go.mod
@mergify mergify bot requested a review from alexanderbez as a code owner April 8, 2022 13:17
@mergify mergify bot added the conflicts label Apr 8, 2022
@alexanderbez alexanderbez merged commit 50dc766 into v0.45.0x-osmo-v7 Apr 8, 2022
@alexanderbez alexanderbez deleted the mergify/bp/v0.45.0x-osmo-v7/pr-175 branch April 8, 2022 15:04
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.

1 participant