summaryrefslogtreecommitdiffstats
path: root/cluster/lam/CONFLICTS
blob: 82441cade4a9c8461bc0ec17027e21877b70dd37 (plain) (blame)
1
2
conflicts  mpich2  &&
conflicts  mpich