From d681109cf48603c6c64ce329f5504e4568c2dce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Thu, 29 Feb 2024 09:13:33 +0100
Subject: [PATCH] fix conflict

---
 .../core/utils/selection-manager/selection.manager.ts       | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts
index 31a6c038b3..78d0311780 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts
@@ -8,11 +8,7 @@ import { UmbArrayState, UmbBooleanState } from '@umbraco-cms/backoffice/observab
  * @export
  * @class UmbSelectionManager
  */
-<<<<<<< HEAD
-export class UmbSelectionManager<ValueType = string | null> extends UmbControllerBase {
-=======
-export class UmbSelectionManager<ValueType extends string | null = string | null> extends UmbBaseController {
->>>>>>> origin/main
+export class UmbSelectionManager<ValueType extends string | null = string | null> extends UmbControllerBase {
 	#selectable = new UmbBooleanState(false);
 	public readonly selectable = this.#selectable.asObservable();