Skip to content

chore: fix mergify conflicts in #8483#8549

Merged
gjermundgaraba merged 2 commits intocosmos:mergify/bp/release/v8.8.x/pr-8448from
noble-assets:dan/fix-mergify-conflicts
Jun 19, 2025
Merged

chore: fix mergify conflicts in #8483#8549
gjermundgaraba merged 2 commits intocosmos:mergify/bp/release/v8.8.x/pr-8448from
noble-assets:dan/fix-mergify-conflicts

Conversation

@boojamya
Copy link

@boojamya boojamya commented Jun 19, 2025

Assist mergify backport in #8483

Steps taken:

  • Fixed conflict in modules/core/02-client/types/codec.go
  • re-built proto's via make proto-all
    • Note: this created protos for 08-wasm/types which I left out of the commit as they don't seem relevant.

@boojamya boojamya marked this pull request as ready for review June 19, 2025 19:13
@boojamya boojamya requested a review from AdityaSripal as a code owner June 19, 2025 19:13
@boojamya boojamya force-pushed the dan/fix-mergify-conflicts branch from 697f42d to ae89005 Compare June 19, 2025 21:23
@gjermundgaraba gjermundgaraba merged commit e77611b into cosmos:mergify/bp/release/v8.8.x/pr-8448 Jun 19, 2025
19 checks passed
gjermundgaraba added a commit that referenced this pull request Jun 19, 2025
Co-authored-by: Gjermund Garaba <gjermund@garaba.net>
Co-authored-by: Justin Tieri <37750742+jtieri@users.noreply.github.com>
Co-authored-by: Dan Kanefsky <56059752+boojamya@users.noreply.github.com>
fix: support amino encoding on MsgRecoverClient (#8448)
fix mergify conflicts in #8483 (#8549)
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