Skip to content
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

fix bad merge conflict #23

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Conversation

baltzell
Copy link

@baltzell baltzell commented Dec 10, 2024

This one: JeffersonLab@9abc31a

And very related to this: JeffersonLab#378 (comment)

Sorry, knew I shouldn't have tried to use github to resolve it ...

@mpaolone mpaolone merged commit a25a4d1 into mpaolone:development Dec 12, 2024
54 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