Conflict resolution in TestSplineFilter.cpp

0b5d58d7 · Charlles Abreu · 9026dbe7 · b0d13582 · 0b5d58d7 · 9026dbe7
Commit 0b5d58d7 authored May 27, 2020 by Charlles Abreu
20 changed files
--- a/tests/TestNoseHooverIntegrator.h
+++ b/tests/TestNoseHooverIntegrator.h
--- a/tests/TestNoseHooverThermostat.h
+++ b/tests/TestNoseHooverThermostat.h
--- a/tests/TestSplineFitter.cpp
+++ b/tests/TestSplineFitter.cpp
--- a/tests/TestVectorize.cpp
+++ b/tests/TestVectorize.cpp
--- a/tests/TestVectorize8.cpp
+++ b/tests/TestVectorize8.cpp
--- a/tests/TestVectorizeGeneric.h
+++ b/tests/TestVectorizeGeneric.h
--- a/wrappers/python/setup.py
+++ b/wrappers/python/setup.py
--- a/wrappers/python/simtk/openmm/__init__.py
+++ b/wrappers/python/simtk/openmm/__init__.py
--- a/wrappers/python/simtk/openmm/app/charmmpsffile.py
+++ b/wrappers/python/simtk/openmm/app/charmmpsffile.py
--- a/wrappers/python/simtk/openmm/app/forcefield.py
+++ b/wrappers/python/simtk/openmm/app/forcefield.py
--- a/wrappers/python/simtk/openmm/app/internal/amber_file_parser.py
+++ b/wrappers/python/simtk/openmm/app/internal/amber_file_parser.py
--- a/wrappers/python/simtk/openmm/app/internal/charmm/topologyobjects.py
+++ b/wrappers/python/simtk/openmm/app/internal/charmm/topologyobjects.py
--- a/wrappers/python/simtk/openmm/app/internal/compiled.pyx
+++ b/wrappers/python/simtk/openmm/app/internal/compiled.pyx
--- a/wrappers/python/simtk/openmm/app/internal/pdbstructure.py
+++ b/wrappers/python/simtk/openmm/app/internal/pdbstructure.py
--- a/wrappers/python/simtk/openmm/app/modeller.py
+++ b/wrappers/python/simtk/openmm/app/modeller.py
--- a/wrappers/python/simtk/openmm/app/statedatareporter.py
+++ b/wrappers/python/simtk/openmm/app/statedatareporter.py
--- a/wrappers/python/simtk/openmm/mtsintegrator.py
+++ b/wrappers/python/simtk/openmm/mtsintegrator.py
--- a/wrappers/python/simtk/unit/quantity.py
+++ b/wrappers/python/simtk/unit/quantity.py
--- a/wrappers/python/simtk/unit/unit.py
+++ b/wrappers/python/simtk/unit/unit.py
--- a/wrappers/python/src/swig_doxygen/swigInputConfig.py
+++ b/wrappers/python/src/swig_doxygen/swigInputConfig.py