Update Material.py

haiiliin · Sep 29, 2024 · ca02750 · ca02750
1 parent 4a6d511
commit ca02750
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/abaqus/Material/Material.py b/src/abaqus/Material/Material.py
@@ -1,13 +1,7 @@
 from __future__ import annotations
 
-<<<<<<< HEAD
-from typing import Union
-
-=======
 from typing import TYPE_CHECKING, Sequence, Union
 
->>>>>>> 2e02a2eb ([typing] Fix typing errors about part features (#5807))
-
 from typing_extensions import Literal
 
 from abqpy.decorators import abaqus_class_doc, abaqus_method_doc