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: bump cosmos-sdk to v0.50.7 (backport #4178) #4180

Merged
merged 3 commits into from
Jun 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2024


This is an automatic backport of pull request #4178 done by [Mergify](https://mergify.com).

(cherry picked from commit e8ab212)

# Conflicts:
#	go.mod
#	go.sum
Copy link
Contributor Author

mergify bot commented Jun 4, 2024

Cherry-pick of e8ab212 has failed:

On branch mergify/bp/release/v28.x.y/pr-4178
Your branch is up to date with 'origin/release/v28.x.y'.

You are currently cherry-picking commit e8ab2121.
  (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:   changelog.md
	modified:   ignite/templates/app/files/go.mod.plush
	modified:   packaging/readme.md

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from julienrbrt as a code owner June 4, 2024 18:51
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll fix the conflicts

@julienrbrt julienrbrt enabled auto-merge (squash) June 5, 2024 10:04
@julienrbrt julienrbrt merged commit 944283b into release/v28.x.y Jun 7, 2024
43 of 45 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v28.x.y/pr-4178 branch June 7, 2024 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants