Skip to content
This repository was archived by the owner on Aug 19, 2026. It is now read-only.

fix editor messup - #27

Merged
madbaron merged 6 commits into
MuonColliderSoft:masterfrom
madbaron:fix_merge_upstream
Sep 5, 2025
Merged

fix editor messup#27
madbaron merged 6 commits into
MuonColliderSoft:masterfrom
madbaron:fix_merge_upstream

Conversation

@madbaron

@madbaron madbaron commented Sep 5, 2025

Copy link
Copy Markdown

This PR fixes a bunch of merge commits that didn't get properly sorted in the manual merge

@madbaron
madbaron merged commit da61b02 into MuonColliderSoft:master Sep 5, 2025
3 of 4 checks passed
@madbaron
madbaron deleted the fix_merge_upstream branch September 5, 2025 22:07
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant