Merge remote-tracking branch 'origin/main' into thermal_expansion · pyiron/atomistics@c10ede5 · GitHub

Commit

Merge remote-tracking branch 'origin/main' into thermal_expansion

Browse files

# Conflicts:
#	atomistics/calculators/lammps/calculator.py
#	atomistics/calculators/lammps/commands.py

Loading branch information

jan-janssen committed Nov 28, 2023

2 parents aad18e1 + d1a7a19 commit c10ede5