FIX: forgotten merge
This commit is contained in:

parent
49656625f1
commit
469b3d766b
3
env/sles15/aarch64/sysconfigs/packages.yaml
vendored
3
env/sles15/aarch64/sysconfigs/packages.yaml
vendored
@ -32,10 +32,7 @@ packages:
|
|||||||
cce:
|
cce:
|
||||||
externals:
|
externals:
|
||||||
- modules:
|
- modules:
|
||||||
<<<<<<< Updated upstream
|
|
||||||
- libfabric/1.22.0
|
- libfabric/1.22.0
|
||||||
=======
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
- PrgEnv-cray/8.5.0
|
- PrgEnv-cray/8.5.0
|
||||||
- cce/17.0.0
|
- cce/17.0.0
|
||||||
spec: cce@=17.0.0
|
spec: cce@=17.0.0
|
||||||
|
Reference in New Issue
Block a user