Merge conflict

This commit is contained in:
shamoon 2024-09-23 11:44:37 -07:00
parent a40cf3ed73
commit c0cb6e2d79

View File

@ -235,9 +235,9 @@ export class FilterEditorComponent
}
case FILTER_HAS_CUSTOM_FIELDS_ANY:
return $localize`Custom fields include: ${this.customFields.find(
(f) => f.id == +rule.value
)?.name}`
return $localize`Custom fields include: ${
this.customFields.find((f) => f.id == +rule.value)?.name
}`
case FILTER_HAS_CUSTOM_FIELDS_ALL:
return $localize`Custom fields: ${