merger conflicts resolved

This commit is contained in:
2018-05-15 11:25:42 +02:00
3 changed files with 77 additions and 63 deletions

View File

@@ -3,6 +3,8 @@ openmpi/3.0.0 stable gcc/7.2.0
openmpi/3.0.0 stable gcc/7.3.0
openmpi/3.0.0 stable intel/17.4
openmpi/3.0.1 unstable gcc/5.5.0
openmpi/3.0.1 unstable gcc/6.4.0
openmpi/3.0.1 unstable gcc/7.3.0
openmpi/3.0.1 stable gcc/5.5.0
openmpi/3.0.1 stable gcc/6.4.0
openmpi/3.0.1 stable gcc/7.3.0
openmpi/3.0.1 unstable gcc/8.1.0
openpmi/3.0.1 unstable intel/18.2