all

windmill-labs · Jan 19, 2025 · 4526b5b · 4526b5b
1 parent 79eba59
commit 4526b5b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/frontend/src/lib/components/apps/editor/componentsPanel/CustomComponentsList.svelte b/frontend/src/lib/components/apps/editor/componentsPanel/CustomComponentsList.svelte
@@ -53,7 +53,7 @@
 		} catch (e) {
 			sendUserToast(
 				'Component creation failed. Is the file uploaded, did you give it a name ? Do you have write privilege on folder app_custom: ' +
-					e.body ?? e,
+					(e.body ?? e),
 				true
 			)
 		}

diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
@@ -31,11 +31,7 @@
 		"strict": true,
 		"types": []
 	},
-<<<<<<< HEAD
-	"include": ["src/**/*.js", "src/**/*.ts", "src/**/*.d.ts", "src/**/*.svelte", "src/lib/components/triggers/TriggersEditorSectionsvelte", "src/lib/components/raw_apps/RawAppCodeEditor.svelte.archive"],
-=======
 	"include": ["src/**/*.js", "src/**/*.ts", "src/**/*.d.ts", "src/**/*.svelte", "src/lib/components/triggers/TriggersEditorSectionsvelte"],
 	"exclude": ["src/lib/monaco_workers/*.js"],
->>>>>>> main
 	"extends": "./.svelte-kit/tsconfig.json"
 }