merge conflict

fusion-energy · Dec 17, 2023 · 745eba4 · 745eba4
2 parents 1301ce1 + 20d78f1
commit 745eba4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/cad_to_dagmc/core.py b/src/cad_to_dagmc/core.py
@@ -82,9 +82,11 @@ def define_moab_core_and_tags() -> typing.Tuple[core.Core, dict]:
 def vertices_to_h5m(
     vertices: typing.Union[
         typing.Iterable[typing.Tuple[float, float, float]],
-        typing.Iterable["cadquery.occ_impl.geom.Vector"],
+        typing.Iterable["cadquery.occ_impl.geom.Vector"]
+    ],
+    triangles_by_solid_by_face: typing.Iterable[
+        typing.Iterable[typing.Tuple[int, int, int]]
     ],
-    triangles_by_solid_by_face: typing.Iterable[typing.Iterable[typing.Tuple[int, int, int]]],
     material_tags: typing.Iterable[str],
     h5m_filename="dagmc.h5m",
 ):