Skip to content

Conversation

@serprex
Copy link

@serprex serprex commented Aug 29, 2023

fixes merge conflict in hyperium#127

merge conflicts has to do with git getting confused in Cargo.toml with bitflags removal upstream

@Ayush1325
Copy link
Owner

@serprex I think you already did the merge fix: hyperium@287bd81
Do I need to merge this PR?

@serprex
Copy link
Author

serprex commented Aug 30, 2023

That commit was made by seanmonstar. No need for this PR

@serprex serprex closed this Aug 30, 2023
@serprex serprex deleted the base64-update branch August 30, 2023 13:59
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.

4 participants