fix: resolves error with merge conflict (Closes #3502)

PKief · PKief · commit 6980b6466a1d · 2026-07-01T18:04:53.000+02:00
diff --git a/src/extension/shared/config.ts b/src/extension/shared/config.ts
@@ -83,6 +83,7 @@ const getConfigValue = <T>(
   }
   if (
     typeof themeConfig.workspaceValue === 'object' &&
+    !Array.isArray(themeConfig.workspaceValue) &&
     themeConfig.workspaceValue &&
     themeConfig.globalValue
   ) {

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ const getConfigValue = <T>(`
`83`	`83`	`}`
`84`	`84`	`if (`
`85`	`85`	`typeof themeConfig.workspaceValue === 'object' &&`
	`86`	`+ !Array.isArray(themeConfig.workspaceValue) &&`
`86`	`87`	`themeConfig.workspaceValue &&`
`87`	`88`	`themeConfig.globalValue`
`88`	`89`	`) {`