Skip to content
Commit a696b263 authored by julient31's avatar julient31
Browse files

Merge branch 'clean-master2' of github.com:julient31/lammps into pppm_spin 

Conflicts:
	src/SPIN/pair_spin_exchange.cpp
	src/atom.cpp
	src/pair.cpp
parents 7a2d3261 89886032
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment

CRA Git | Maintained and supported by SUSTech CRA and CCSE