resolved conflict

73183c61 · ChayaSt · 0e218233 · 32e08b87 · 73183c61 · 73183c61
Commit 73183c61 authored May 31, 2016 by ChayaSt
20 changed files
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaStretchBendForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaStretchBendForce.h
--- a/plugins/amoeba/openmmapi/include/openmm/AmoebaTorsionTorsionForce.h
+++ b/plugins/amoeba/openmmapi/include/openmm/AmoebaTorsionTorsionForce.h
--- a/plugins/amoeba/openmmapi/src/AmoebaAngleForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaAngleForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaBondForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaBondForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaPiTorsionForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaPiTorsionForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaStretchBendForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaStretchBendForce.cpp
--- a/plugins/amoeba/openmmapi/src/AmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/openmmapi/src/AmoebaTorsionTorsionForce.cpp
--- a/plugins/amoeba/platforms/cuda/src/AmoebaCudaKernels.cpp
+++ b/plugins/amoeba/platforms/cuda/src/AmoebaCudaKernels.cpp
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaInPlaneForce.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaInPlaneForce.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaOutOfPlaneBendForce.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaOutOfPlaneBendForce.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaPiTorsionForce.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaPiTorsionForce.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaStretchBendForce.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaStretchBendForce.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/amoebaTorsionTorsionForce.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/amoebaTorsionTorsionForce.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/multipoleElectrostatics.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/multipoleElectrostatics.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/multipoleFixedField.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/multipoleFixedField.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/multipoleInducedField.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/multipoleInducedField.cu
--- a/plugins/amoeba/platforms/cuda/src/kernels/pmeMultipoleElectrostatics.cu
+++ b/plugins/amoeba/platforms/cuda/src/kernels/pmeMultipoleElectrostatics.cu
--- a/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaAngleForce.cpp
+++ b/plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaAngleForce.cpp