Skip to content

Conversation

@hyperupcall
Copy link
Collaborator

@hyperupcall hyperupcall commented Feb 19, 2024

PR #1134 merged into master, instead of main. This re-merges those changes back into main. I think this has to be "regularly merged" (not squash merge and not rebase merge) so GitHub does not say that master is 1 commit ahead of main.

@spacewander spacewander merged commit 52897f7 into tj:main Feb 20, 2024
@spacewander
Copy link
Collaborator

Nice catch, thanks!

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