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.

Sign up for GitHub

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

Jump to bottom

fix: gov proto merge conflict #270

Merged
merged 1 commit into from
Jun 23, 2022
Merged

fix: gov proto merge conflict #270

merged 1 commit into from
Jun 23, 2022

Conversation

p0mvn
Copy link
Member

@p0mvn p0mvn commented Jun 23, 2022

Closes: #259

What is the purpose of the change

#257 broke proto generation due to merge conflict. This PR resolves the conflict

Testing and Verifying

This change can be verified as follows:

  • make proto-all

Documentation and Release Note

  • Does this pull request introduce a new feature or user-facing behavior changes? no
  • Is a relevant changelog entry added to the Unreleased section in CHANGELOG.md? no
  • How is the feature or change documented? not applicable

@p0mvn p0mvn requested a review from ValarDragon June 23, 2022 02:41
@p0mvn p0mvn marked this pull request as ready for review June 23, 2022 02:41
@p0mvn p0mvn requested a review from alexanderbez as a code owner June 23, 2022 02:41
@p0mvn p0mvn merged commit 9236d5a into v0.45.0x-osmo-v7 Jun 23, 2022
@p0mvn p0mvn deleted the roman/fix-gov-proto branch June 23, 2022 18:43
p0mvn added a commit that referenced this pull request Jun 23, 2022
@p0mvn
fix: gov proto merge conflict (#270)
0ebfa52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexanderbez alexanderbez alexanderbez approved these changes

@ValarDragon ValarDragon Awaiting requested review from ValarDragon

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@p0mvn @alexanderbez