Skip to content

fix merge conflict from v2.0.10 hotfix#1515

Merged
sam0x17 merged 5 commits intodevnet-readyfrom
sam-fix-hotfix-merge-conflict-4-7-2025
Apr 7, 2025
Merged

fix merge conflict from v2.0.10 hotfix#1515
sam0x17 merged 5 commits intodevnet-readyfrom
sam-fix-hotfix-merge-conflict-4-7-2025

Conversation

@sam0x17
Copy link
Contributor

@sam0x17 sam0x17 commented Apr 7, 2025

shamil-gadelshin and others added 5 commits April 4, 2025 14:13
- change the function to use FirstEmissionBlockNumber parameter instead of NetworkRegisteredAt.
Change update_moving_price() function
@sam0x17 sam0x17 self-assigned this Apr 7, 2025
@sam0x17 sam0x17 changed the title fix merge conflict from hotfix fix merge conflict from v2.0.10 hotfix Apr 7, 2025
@sam0x17 sam0x17 added the skip-cargo-audit This PR fails cargo audit but needs to be merged anyway label Apr 7, 2025
@sam0x17 sam0x17 merged commit 23c9087 into devnet-ready Apr 7, 2025
56 of 86 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-cargo-audit This PR fails cargo audit but needs to be merged anyway

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants