peteboyd / lammps_interface

automatic generation of LAMMPS input files for molecular dynamics simulations of MOFs
MIT License
125 stars 63 forks source link

fix merge conflicts of last PR #20

Closed ltalirz closed 4 years ago

ltalirz commented 4 years ago

I guess there was a conflict between my last PRs that was not ideally resolved.