yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Niels Lyngsø
2024-02-29 09:13:33 +01:00
parent a80c815d7a
commit d681109cf4
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts
View File

@@ -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();