up
This commit is contained in:
commit
77323d29db
1 changed files with 7 additions and 0 deletions
|
|
@ -7,7 +7,14 @@ import xml.etree.ElementTree as ET
|
|||
from datetime import date
|
||||
from typing import Any
|
||||
|
||||
<<<<<<< HEAD
|
||||
from ..blender.blender_mesh_capture import SlicingGroup, SlicingCollection
|
||||
=======
|
||||
try:
|
||||
from ..blender.blender_mesh_capture import SlicingGroup, SlicingCollection
|
||||
except ImportError:
|
||||
from ..infra.blender_mesh_capture import SlicingGroup, SlicingCollection
|
||||
>>>>>>> 9d282dee016bdbc10e4529120ee4e3faedbe6685
|
||||
|
||||
script_dir = os.path.dirname(os.path.abspath(__file__))
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue