conflicts resolved

This commit is contained in:
2019-03-11 11:23:59 +01:00

View File

@@ -1,3 +1,3 @@
lammps/2018.3 unstable gcc/7.3.0 openmpi/3.0.1
lammps/2018.3_merlin unstable gcc/8.2.0 openmpi/3.1.1 b:cmake/3.9.6
lammps/2018.11_merlin unstable gcc/8.2.0 openmpi/3.1.1 Python/2.7.14 b:cmake/3.9.6
lammps/2018.3_merlin unstable gcc/8.2.0 openmpi/3.1.1 b:cmake/3.9.6
lammps/2018.11_merlin stable gcc/8.2.0 openmpi/3.1.1 Python/2.7.14 b:cmake/3.9.6