mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-10-13 08:02:47 +00:00
Conflicts were all additive on both sides: - workspace_settings column lists (workspaces_extra.rs, summarized_schema.txt) - feature usage disclosure copy (InstanceSettings.svelte) - VariableForm/VariableEditor imports against the new operatingWorkspace helper - utils_draft_deploy.test.ts: kept both the variable expiry and resource suites - cli variable push rebased onto main's extra_perms split of localVariableBody Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Do7wJTnL6MG6ngFpCGW4DG