From c0cb6e2d793441c99b4a9b1a44bc6559a6babc5f Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Mon, 23 Sep 2024 11:44:37 -0700
Subject: [PATCH] Merge conflict

---
 .../document-list/filter-editor/filter-editor.component.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index 3356411c2..14680cc2a 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -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: ${