Skip to content

Commit a92b3d3

Browse files
committed
fix(settings): resolve duplicate property conflicts from rebase
Remove duplicate wrapTabs properties that were introduced by parallel batch-1 changes during rebase. Keeps the first occurrence of each.
1 parent 243dd60 commit a92b3d3

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

src/components/settings/JsonSettingsEditor.tsx

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -725,23 +725,6 @@ const cortex_SETTINGS_SCHEMA = {
725725
"[markdown]": { "wordWrap": "on" }
726726
}
727727
]
728-
},
729-
workbench: {
730-
type: "object",
731-
description: "Workbench settings (tabs, layout, etc.)",
732-
properties: {
733-
editor: {
734-
type: "object",
735-
description: "Workbench editor tab settings",
736-
properties: {
737-
wrapTabs: {
738-
type: "boolean",
739-
description: "Whether to wrap tabs to multiple rows",
740-
default: false
741-
}
742-
}
743-
}
744-
}
745728
}
746729
},
747730
patternProperties: {

0 commit comments

Comments
 (0)