Skip to content

GitLab

"platforms/cpu/vscode:/vscode.git/clone" did not exist on "77c00e41ac4524b1b5f66663f7b12a315ec6a436"
Commit 1c938ceb authored by Jason Swails's avatar Jason Swails
Browse files

Merge branch 'master' into amber-switching 

 Conflicts:
	wrappers/python/simtk/openmm/app/amberprmtopfile.py

In fixing the merge conflict, I went ahead and fixed up the switchDistance logic
to match what I did in CharmmPsfFile.
parents a1113e7b 167ae8a0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 0 deletions
Markdown is supported
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