Skip to content

feat: resolve conflicts caused by merging with release/v0.2.0 branch #25

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
Merged
huyhuynh3103 merged 4 commits into from
Dec 29, 2024
Merged

feat: resolve conflicts caused by merging with release/v0.2.0 branch #25

huyhuynh3103 merged 4 commits into from
Dec 29, 2024

Conversation

@huyhuynh3103
Copy link
Contributor

@huyhuynh3103 huyhuynh3103 commented Dec 29, 2024

Description

  • In the release/v0.2.0 branch, ERC1155 Common was built on OpenZeppelin v4. This leads to many conflicts related to the OpenZeppelin version when upgrading to v5.

Checklist

  • I have clearly commented on all the main functions following the NatSpec Format
  • The box that allows repo maintainers to update this PR is checked
  • I tested locally to make sure this feature/fix works

TuDo1403
TuDo1403 reviewed Dec 29, 2024
View reviewed changes
TuDo1403
TuDo1403 reviewed Dec 29, 2024
View reviewed changes
TuDo1403
TuDo1403 reviewed Dec 29, 2024
View reviewed changes
@huyhuynh3103 huyhuynh3103 merged commit d7924bd into feature/adapt-oz-v5 Dec 29, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@TuDo1403 TuDo1403 TuDo1403 approved these changes

Reviewers whose approvals may not affect merge requirements

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

@huyhuynh3103 @TuDo1403