resolve conflict

wrappers/python/tests/TestForceField.py

@@ -762,6 +762,13 @@ class TestForceField(unittest.TestCase):
         self.assertEqual('ALA', templates[0].name)
         self.assertEqual('NME', templates[1].name)
     
+    def test_Includes(self):
+        """Test using a ForceField that includes other files."""
+        forcefield = ForceField(os.path.join('systems', 'ff_with_includes.xml'))
+        self.assertTrue(len(forcefield._atomTypes) > 10)
+        self.assertTrue('spce-O' in forcefield._atomTypes)
+        self.assertTrue('HOH' in forcefield._templates)
+
     def test_ImpropersOrdering(self):
         """Test correctness of the ordering of atom indexes in improper torsions
         and the torsion.ordering parameter.