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

Merge branch 'core_soft' of https://github.com/agiliopadua/lammps into... 

Merge branch 'core_soft' of https://github.com/agiliopadua/lammps into combined-user-fep-soft-updates

Resolved Conflicts:
	doc/src/compute_fep.txt
	doc/src/fix_adapt_fep.txt
parents 1be589fb 0bfb3438
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