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: Build error due to merge conflict #1068

Merged
merged 1 commit into from
May 21, 2024

Conversation

caspermeijn
Copy link
Collaborator

Due to two pull requests changing the same function a build error occurred. fields has move to inside oneof and has changed type.

Due to two pull requests changing the same function a build error occurred. `fields` has move to inside `oneof` and has changed type.
@caspermeijn caspermeijn added this pull request to the merge queue May 21, 2024
Merged via the queue into tokio-rs:master with commit b2ce9ed May 21, 2024
15 checks passed
@caspermeijn caspermeijn deleted the fix_main branch May 21, 2024 13:32
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