fix: merge conflicts

This commit is contained in:
psychedelicious 2023-10-02 19:42:50 +11:00 committed by Kent Keirsey
parent 3611029057
commit f50f95a81d

View File

@ -20,7 +20,7 @@ from invokeai.app.invocations.baseinvocation import (
invocation_output,
)
from invokeai.app.invocations.primitives import ImageField, ImageOutput
from invokeai.app.models.image import ImageCategory, ResourceOrigin
from invokeai.app.services.image_records.image_records_common import ImageCategory, ResourceOrigin
@invocation_output("face_mask_output")