Skip to content
Snippets Groups Projects
Commit 57881f4a authored by Eleni Mathioulaki's avatar Eleni Mathioulaki
Browse files

Merge branch 'sda' into 'master' 

Add conflict statement to sda as suggested

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!144
parents 798613f7 bd6b789b
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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