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: resolve conflicts of [BP: v7 <- #1009] #1016

Merged
merged 1 commit into from
Mar 11, 2024
Merged

fix: resolve conflicts of [BP: v7 <- #1009] #1016

merged 1 commit into from
Mar 11, 2024

Conversation

madrezaz
Copy link
Contributor

Resolves the conflicts of #1010

@madrezaz madrezaz requested a review from a team as a code owner March 11, 2024 18:01
@madrezaz madrezaz requested review from misko9 and removed request for a team March 11, 2024 18:01
Copy link

vercel bot commented Mar 11, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
interchaintest-docs ⬜️ Ignored (Inspect) Visit Preview Mar 11, 2024 6:01pm

@madrezaz madrezaz changed the title fix: resolve conflicts fix: resolve conflicts of [BP: v7 <- #1009] Mar 11, 2024
@Reecepbcups Reecepbcups merged commit 4d76fc1 into strangelove-ventures:mergify/bp/v7/pr-1009 Mar 11, 2024
12 of 13 checks passed
@madrezaz madrezaz deleted the resolve-mergify/bp/v7/pr-1009 branch March 11, 2024 18:27
Reecepbcups pushed a commit that referenced this pull request Mar 11, 2024
…use chain's bech32 prefix when converting AccAddress to string (#1010)

* feat: replace broadcaster's account retriever to use chain's bech32 prefix when converting AccAddress to string (#1009)

* feat: replace broadcaster's account retriever to use chain's bech32 prefix when converting AccAddress to string

* refactor: enhance AccountRetriever

(cherry picked from commit 1d1b837)

# Conflicts:
#	chain/cosmos/broadcaster.go

* fix: resolve conflicts (#1016)

---------

Co-authored-by: MadReza <[email protected]>
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