Remove extraneous text

mosdef-hub · Jun 29, 2023 · a666e99 · a666e99
1 parent 47185f7
commit a666e99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/gmso/external/convert_parmed.py b/gmso/external/convert_parmed.py
@@ -585,16 +585,8 @@ def _atom_types_from_gmso(top, structure, atom_map):
         atype = pmd.AtomType(
             atype_name,
             None,
-<<<<<<< HEAD
             atype_mass,
             atype_atomic_number,
-||||||| e488a03
-            atype_element.mass,
-            atype_element.atomic_number,
-=======
-            atype_mass,
-            atype_element.atomic_number,
->>>>>>> 727d32a180bb171272445d6f2140174610f6ff47
             atype_charge,
         )
         atype.set_lj_params(atype_epsilon, atype_rmin)

diff --git a/gmso/tests/test_lammps.py b/gmso/tests/test_lammps.py
@@ -534,8 +534,8 @@ def test_units_in_headers(self, typed_ethane):
         for i, line in enumerate(lines):
             if "Coeffs" in line:
                 units = lines[i + 1].split(" \n")
-                for i in range(len(units[1:-1:2])):
-                    assert units[i * 2 + 1] == unitsDict[units[i * 2 + 2]]
+                for j in range(len(units[1:-1:2])):
+                    assert units[j * 2 + 1] == unitsDict[units[j * 2 + 2]]
 
     def test_atom_style_printing(self, typed_ethane):
         """Check writers for correctly printing potential eqn."""