From 1d0cb49f5c1c9524dff57eb88140e661635496c9 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Sat, 11 Nov 2023 15:59:10 +0100
Subject: [PATCH] Fix merge.

---
 backend/src/Squidex/wwwroot/scripts/editor-sdk.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/backend/src/Squidex/wwwroot/scripts/editor-sdk.d.ts b/backend/src/Squidex/wwwroot/scripts/editor-sdk.d.ts
index 06c712e87..522fa94e4 100644
--- a/backend/src/Squidex/wwwroot/scripts/editor-sdk.d.ts
+++ b/backend/src/Squidex/wwwroot/scripts/editor-sdk.d.ts
@@ -181,8 +181,6 @@ declare class SquidexFormField {
      * 
      * @param schemas: The list of schema names.
      * @param callback The callback to invoke when the dialog is completed or closed.
-<<<<<<< HEAD
-=======
      * @param query: The initial query that is used in the UI.
      * @param selectedIds: The selected ids to mark them as selected in the content selector dialog.
      */
@@ -190,7 +188,6 @@ declare class SquidexFormField {
 
     /**
      * Shows a dialog to pick a file.
->>>>>>> 8f149db852d984489e6ca1a07af988dac917ab56
      */
     pickFile(): void;