From f50f95a81da049429000ee31f4d3e3b55e8f4c1d Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Mon, 2 Oct 2023 19:42:50 +1100 Subject: [PATCH] fix: merge conflicts --- invokeai/app/invocations/facetools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/invokeai/app/invocations/facetools.py b/invokeai/app/invocations/facetools.py index 7926f76ce2..a433fac792 100644 --- a/invokeai/app/invocations/facetools.py +++ b/invokeai/app/invocations/facetools.py @@ -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")