Merge remote-tracking branch 'origin/Add_Type_core_2' into Add_Type_c… · mantidproject/mantidimaging@1cbf059 · GitHub

Commit

Merge remote-tracking branch 'origin/Add_Type_core_2' into Add_Type_c…

Browse files

…ore_2

# Conflicts:
#	mantidimaging/core/reconstruct/tomopy_recon.py
#	mantidimaging/core/rotation/polyfit_correlation.py

Loading branch information

ashmeigh committed Jul 25, 2024

2 parents b2857db + 55c02cd commit 1cbf059