Skip to content
Unverified Commit 96cc098d authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'new-ILP-parameters' of github.com:oywg11/lammps into new-ILP-parameters 

# Conflicts:
#	doc/txt/pair_ilp_graphene_hbn.txt
#	doc/txt/pair_kolmogorov_crespi_full.txt
parents 4dc37bf5 8ffe1587
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