chore: merge conflict

Author: Julusian

packages/webui/src/client/ui/Settings/Studio/Generic.tsx

@@ -400,16 +400,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
 				{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
 			</LabelAndOverridesForCheckbox>
 
-			<LabelAndOverridesForCheckbox
-				label={t('Double click selection for properties panel')}
-				item={wrappedItem}
-				itemKey={'enableUserEdits'}
-				overrideHelper={overrideHelper}
-				hint={t('This feature enables user edits')}
-			>
-				{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
-			</LabelAndOverridesForCheckbox>
-
 			<LabelAndOverridesForCheckbox
 				label={t('Enable QuickLoop')}
 				item={wrappedItem}