Skip to content

fix broken main #8209

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

Merged
merged 1 commit into from
May 23, 2025
Merged

fix broken main #8209

merged 1 commit into from
May 23, 2025

Conversation

sunshowers
Copy link
Contributor

@sunshowers sunshowers commented May 23, 2025

Semantic merge conflict between #8177 and #8183. The test appears to pass locally.

Created using spr 1.3.6-beta.1
@sunshowers sunshowers requested review from smklein and wfchandler May 23, 2025 18:53
@sunshowers sunshowers changed the title attempt to fix broken main fix broken main May 23, 2025
@sunshowers sunshowers enabled auto-merge (squash) May 23, 2025 18:56
@sunshowers sunshowers merged commit 710abbd into main May 23, 2025
16 checks passed
@sunshowers sunshowers deleted the sunshowers/spr/attempt-to-fix-broken-main branch May 23, 2025 20:25
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.

3 participants