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 conflicts #903

Merged

Conversation

jhernandezb
Copy link
Member

No description provided.

spoo-bar and others added 25 commits September 25, 2023 14:39
* bump ledger go and hid

* bump ledger-cosmos
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.12.0 to 0.17.0.
- [Commits](golang/net@v0.12.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
feat: migrate the x/cron proposals to gov v1 type
@jhernandezb jhernandezb merged commit 22f05e0 into spoorthi/migrate-globalfee-props Oct 17, 2023
4 of 5 checks passed
@spoo-bar spoo-bar deleted the jhernandezb/migrate-globalfee-props branch October 17, 2023 19:10
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.

2 participants