Skip to content
Snippets Groups Projects
Commit d3533a0b authored by Jan Kožusznik's avatar Jan Kožusznik
Browse files

Merge branch 'iss1026-changeInputOutputDir' 

Conflicts:
	haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java
	haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java
	haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java
parents a3ac7c58 25866b14
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 550 additions and 126 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment