resolved conflict

73183c61 · ChayaSt · 0e218233 · 32e08b87 · 73183c61 · 73183c61
Commit 73183c61 authored May 31, 2016 by ChayaSt
20 changed files
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceOutOfPlaneBendForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceOutOfPlaneBendForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferencePiTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferencePiTorsionForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferencePiTorsionForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferencePiTorsionForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceStretchBendForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceStretchBendForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceStretchBendForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceStretchBendForce.h
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceTorsionTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceTorsionTorsionForce.cpp
--- a/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceTorsionTorsionForce.h
+++ b/plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceTorsionTorsionForce.h
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaAngleForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaAngleForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaBondForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaBondForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaPiTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaPiTorsionForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaStretchBendForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaStretchBendForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaTorsionTorsionForce.cpp
--- a/plugins/amoeba/serialization/src/AmoebaAngleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaAngleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaBondForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaBondForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaInPlaneAngleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaInPlaneAngleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaOutOfPlaneBendForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaOutOfPlaneBendForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaPiTorsionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaPiTorsionForceProxy.cpp