Skip to content
Snippets Groups Projects
Commit 82364d10 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'grem-feature' of https://github.com/dstelter92/lammps into grem-feature 

Resolved merge conflicts and adapted logic to most recent changes in feature branch

Closes #46
parents 683f514f 16c8a307
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment