resolved conflict

73183c61 · ChayaSt · 0e218233 · 32e08b87 · 73183c61 · 73183c61
Commit 73183c61 authored May 31, 2016 by ChayaSt
20 changed files
--- a/plugins/amoeba/serialization/src/AmoebaStretchBendForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaStretchBendForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaTorsionTorsionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaTorsionTorsionForceProxy.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaAngleForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaAngleForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaBondForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaBondForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaPiTorsionForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaPiTorsionForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaStretchBendForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaStretchBendForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaTorsionTorsionForce.cpp
--- a/plugins/drude/platforms/cuda/tests/TestCudaDrudeForce.cpp
+++ b/plugins/drude/platforms/cuda/tests/TestCudaDrudeForce.cpp
--- a/plugins/drude/platforms/cuda/tests/TestCudaDrudeLangevinIntegrator.cpp
+++ b/plugins/drude/platforms/cuda/tests/TestCudaDrudeLangevinIntegrator.cpp
--- a/plugins/drude/platforms/cuda/tests/TestCudaDrudeSCFIntegrator.cpp
+++ b/plugins/drude/platforms/cuda/tests/TestCudaDrudeSCFIntegrator.cpp
--- a/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeForce.cpp
+++ b/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeForce.cpp
--- a/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeLangevinIntegrator.cpp
+++ b/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeLangevinIntegrator.cpp
--- a/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeSCFIntegrator.cpp
+++ b/plugins/drude/platforms/opencl/tests/TestOpenCLDrudeSCFIntegrator.cpp
--- a/plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
+++ b/plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
--- a/plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
+++ b/plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
--- a/serialization/src/CMAPTorsionForceProxy.cpp
+++ b/serialization/src/CMAPTorsionForceProxy.cpp
--- a/serialization/src/CustomAngleForceProxy.cpp
+++ b/serialization/src/CustomAngleForceProxy.cpp
--- a/serialization/src/CustomBondForceProxy.cpp
+++ b/serialization/src/CustomBondForceProxy.cpp