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.

Sign up for GitHub

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

Jump to bottom

Fixed build conflicts, kindof. #733

Closed

Paul-Ferrell wants to merge 2 commits into master from build-conflict-quick-fix

Collaborator

Paul-Ferrell commented Jan 25, 2024

Code review checklist:

Code is generally sensical and well commented
Variable/function names all telegraph their purpose and contents
Functions/classes have useful doc strings
Function arguments are typed
Added/modified unit tests to cover changes.
New features have documentation added to the docs.
New features and backwards compatibility breaks are noted in the RELEASE.md


          Fixed build conflicts, kindof.

29bd229

Paul-Ferrell assigned francinelapid and agoodLANL


          Remove trailing whitespace

4e5f5ab

agoodLANL approved these changes

View reviewed changes

Collaborator

agoodLANL left a comment

Nothing stuck out as problematic to me. Approving for merge

Collaborator Author

Paul-Ferrell commented Mar 21, 2024

@hwikle-lanl has already put in a better fix for this problem.

Paul-Ferrell closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet