fix stuff again

- got rid of upstream stuff generated by github, which made it blow up... - got closer on the pmx importer working
2024-06-14 21:29:30 -04:00
parent c1f30e9fa5
commit c0509bbaf4
4 changed files with 28 additions and 20 deletions
@@ -1,14 +1,9 @@
 import bpy
 from ..core.register import register_wrap
-<<<<<<< Updated upstream
-from ..core.pmx.import_pmx import import_pmx
-from ..core.pmd.import_pmd import import_pmd
-=======
 from .panel import AvatarToolkitPanel

 from ..core.import_pmx import import_pmx
 from ..core.import_pmd import import_pmd
->>>>>>> Stashed changes

@register_wrap
 class AvatarToolkitQuickAccessPanel(bpy.types.Panel):