Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/lammps_refactor_2' into thermal_…
Browse files Browse the repository at this point in the history
…expansion

# Conflicts:
#	atomistics/calculators/lammps/calculator.py
#	atomistics/calculators/lammps/commands.py
  • Loading branch information
jan-janssen committed Nov 28, 2023
2 parents aad18e1 + 9ecaf8d commit ad6efed
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit ad6efed

Please sign in to comment.