fix merge conflict (35431cce) · Commits · EBRAINS RI / Tech Hub / Platform / EBRAINS Software Distribution / ebrains-spack-builds · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ebrains-spack-builds
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

35431cce

Commit 35431cce authored 3 years ago by

Eleni Mathioulaki

Downloads
- Plain Diff

fix merge conflict

parents a351b56c 93728a85

No related branches found

No related tags found

3 merge requests!331BrainScaleS: Update software state,!149Update BrainScaleS-2 to latest HEAD,!148create new experimental release

Pipeline #17980 failed with stage

in 2 hours, 29 minutes, and 41 seconds

Changes 11
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 5 additions, 5 deletions

.gitlab-ci.yml
packages/apbs/package.py 6 additions, 6 deletions

packages/apbs/package.py
packages/arbor/package.py 111 additions, 0 deletions

packages/arbor/package.py
packages/hxtorch/package.py 41 additions, 6 deletions

packages/hxtorch/package.py
packages/py-ipycanvas/package.py 29 additions, 0 deletions

packages/py-ipycanvas/package.py
packages/py-mmcif-pdbx/package.py 26 additions, 0 deletions

packages/py-mmcif-pdbx/package.py
packages/py-pdb2pqr/package.py 5 additions, 0 deletions

packages/py-pdb2pqr/package.py
packages/py-propka/package.py 29 additions, 0 deletions

packages/py-propka/package.py
packages/pynn-brainscales/package.py 3 additions, 2 deletions

packages/pynn-brainscales/package.py
packages/sda/package.py 1 addition, 1 deletion

packages/sda/package.py
spack.yaml 6 additions, 5 deletions

spack.yaml

with 262 additions and 25 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment