resolve merge conflict

2024-11-04 15:06:32 +01:00
parent 37e93b5274
commit 4dffbf3bcb
2 changed files with 2 additions and 1 deletions
--- a/src/Umbraco.Web.UI.Client/examples/ufm-custom-component/index.ts
+++ b/src/Umbraco.Web.UI.Client/examples/ufm-custom-component/index.ts
@@ -8,6 +8,7 @@ export const manifests: Array<ManifestUfmComponent> = [
 		api: () => import('./custom-ufm-component.js'),
 		meta: {
 			marker: '%',
+			alias: 'myCustomComponent',
 		},
 	},
 ];