resolve: Merge conflicts

2024-08-30 20:32:17 +00:00 · 2023-08-29 12:08:00 +12:00
parent 383d008529
commit d0c74822eb
2 changed files with 2 additions and 13 deletions
--- a/invokeai/app/invocations/image.py
+++ b/invokeai/app/invocations/image.py
@ -404,6 +404,7 @@ class ImageResizeInvocation(BaseInvocation):
            node_id=self.id,
            session_id=context.graph_execution_state_id,
            is_intermediate=self.is_intermediate,
+            metadata=self.metadata.dict() if self.metadata else None,
            workflow=self.workflow,
        )