Skip to content

Conversation

@amartini51
Copy link
Member

Fixes rdar://97455009

@amartini51 amartini51 requested a review from rxwei March 17, 2023 21:18
Incorporates tech review from Richard Wei <[email protected]>.
This clears out a merge conflict that GitHub's web UI couldn't resolve,
but which didn't require any manual intervention to handle when merging
locally at the command line.  Probably just an issue with files being
renamed on 'main' and edited on this branch.
@amartini51 amartini51 merged commit 3d8289e into swiftlang:main May 26, 2023
@amartini51 amartini51 deleted the partial_block_97455009 branch May 26, 2023 23:05
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.

5 participants