From 61c62358a70f236939cb46609356b7710550d98a Mon Sep 17 00:00:00 2001 From: Tim deBoer Date: Fri, 26 Jan 2024 08:14:18 -0500 Subject: [PATCH] chore: merge conflict Fix one more merge conflict. Signed-off-by: Tim deBoer --- packages/renderer/src/lib/image/image-utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/renderer/src/lib/image/image-utils.ts b/packages/renderer/src/lib/image/image-utils.ts index eb5e98a7e242e..7fe0ee5fee5c7 100644 --- a/packages/renderer/src/lib/image/image-utils.ts +++ b/packages/renderer/src/lib/image/image-utils.ts @@ -184,7 +184,7 @@ export class ImageUtils { tag: '', base64RepoTag: this.getBase64EncodedName(''), selected: false, - status: this.getInUse(imageInfo, containersInfo) ? 'USED' : 'UNUSED', + status: this.getInUse(imageInfo, undefined, containersInfo) ? 'USED' : 'UNUSED', badges, icon, labels: imageInfo.Labels, @@ -205,7 +205,7 @@ export class ImageUtils { tag: this.getTag(repoTag), base64RepoTag: this.getBase64EncodedName(repoTag), selected: false, - status: this.getInUse(imageInfo, containersInfo) ? 'USED' : 'UNUSED', + status: this.getInUse(imageInfo, repoTag, containersInfo) ? 'USED' : 'UNUSED', badges, icon, labels: imageInfo.Labels,