Skip to content

Commit

Permalink
chore: merge conflict
Browse files Browse the repository at this point in the history
Fix one more merge conflict.

Signed-off-by: Tim deBoer <[email protected]>
  • Loading branch information
deboer-tim committed Jan 26, 2024
1 parent 98ad8ab commit 61c6235
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/renderer/src/lib/image/image-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export class ImageUtils {
tag: '',
base64RepoTag: this.getBase64EncodedName('<none>'),
selected: false,
status: this.getInUse(imageInfo, containersInfo) ? 'USED' : 'UNUSED',
status: this.getInUse(imageInfo, undefined, containersInfo) ? 'USED' : 'UNUSED',
badges,
icon,
labels: imageInfo.Labels,
Expand All @@ -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,
Expand Down

0 comments on commit 61c6235

Please sign in to comment.