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

Merge branch 'USER-DPD_hybrid_atom_bugfix' of... 

Merge branch 'USER-DPD_hybrid_atom_bugfix' of https://github.com/timattox/lammps_USER-DPD into small-changes

This closes #200
parents 0853cdbe d31121b1
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