Commit c268307d authored by gsell's avatar gsell

conflicts resolved

parents 9c639f89 fdf7af65
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment