Skip to content

Fix merge conflict#8991

Merged
tengyifei merged 1 commit intomasterfrom
piz/test
Apr 17, 2025
Merged

Fix merge conflict#8991
tengyifei merged 1 commit intomasterfrom
piz/test

Conversation

@zpcore
Copy link
Copy Markdown
Member

@zpcore zpcore commented Apr 16, 2025

There is a merge conflict between #8978 and #8981 after using the auto merge.

@zpcore zpcore requested a review from tengyifei April 16, 2025 23:10
@zpcore zpcore marked this pull request as ready for review April 16, 2025 23:11
@tengyifei tengyifei enabled auto-merge (squash) April 16, 2025 23:11
@tengyifei
Copy link
Copy Markdown
Collaborator

Still got some test failures. I'll fixenate.

@tengyifei tengyifei merged commit 083934f into master Apr 17, 2025
23 of 24 checks passed
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