Skip to content
Snippets Groups Projects
Commit d8a8e81e authored by Christopher Randolph Rhodes's avatar Christopher Randolph Rhodes
Browse files

Merge branch 'chaeo_zmask_class' into chaeo_pipeline

# Conflicts:
#	model_server/base/accessors.py
#	model_server/base/api.py
#	model_server/base/models.py
#	model_server/base/workflows.py
#	model_server/extensions/chaeo/accessors.py
#	model_server/extensions/chaeo/annotators.py
#	model_server/extensions/chaeo/batch_jobs/20231028_Porto_PA.py
#	model_server/extensions/chaeo/batch_jobs/coloring_book.py
#	model_server/extensions/chaeo/conf/testing.py
#	model_server/extensions/chaeo/examples/batch_obj_cla.py
#	model_server/extensions/chaeo/examples/export_patch_focus_metrics.py
#	model_server/extensions/chaeo/examples/transfer_labels_to_ilastik_object_classifier.py
#	model_server/extensions/chaeo/models.py
#	model_server/extensions/chaeo/process.py
#	model_server/extensions/chaeo/products.py
#	model_server/extensions/chaeo/tests/test_accessors.py
#	model_server/extensions/chaeo/tests/test_process.py
#	model_server/extensions/chaeo/tests/test_zstack.py
#	model_server/extensions/chaeo/workflows.py
#	model_server/extensions/chaeo/zmask.py
#	model_server/extensions/ilastik/models.py
#	model_server/extensions/ilastik/tests/test_ilastik.py
#	model_server/extensions/ilastik/validators.py
#	tests/test_accessors.py
#	tests/test_model.py
#	tests/test_process.py
#	tests/test_session.py
#	tests/test_workflow.py
parents 2c790544 889870f8
No related branches found
No related tags found
No related merge requests found
Showing
with 947 additions and 934 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment