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: resolve conflicts #225

Merged
merged 1 commit into from
Jul 19, 2023
Merged

fix: resolve conflicts #225

merged 1 commit into from
Jul 19, 2023

Conversation

3eyedraga
Copy link
Contributor

Description

Type of change

Please check the options that are relevant. This PR introduces

  • Bug fix (non-breaking change which fixes an existing issue)
  • New feature (non-breaking change which adds new functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Features Description

  • NA

Test Cases

  • NA

Documentation

Checklist:

  • I have added change type (major|minor|patch) in the PR
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

@3eyedraga 3eyedraga merged commit 3f121c3 into feature/subaccount Jul 19, 2023
18 checks passed
@3eyedraga 3eyedraga deleted the fix/conflicts branch July 19, 2023 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
C:CLI C:docs C:x/bet C:x/market C:x/mint C:x/orderbook C:x/ovm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@3eyedraga