conflict resolved

This commit is contained in:
2019-01-08 10:56:09 +01:00
15 changed files with 143 additions and 82 deletions

View File

@@ -14,6 +14,8 @@ openmpi/3.1.1 stable gcc/8.1.0
openmpi/3.1.1 stable gcc/8.2.0
openmpi/3.1.2 stable gcc/7.3.0
openmpi/3.1.2 stable gcc/8.2.0
openmpi/3.1.2 stable intel/18.4
openmpi/3.1.3 stable gcc/4.8.5
openmpi/3.1.3 stable gcc/5.5.0