mirror of
https://github.com/simstudioai/sim.git
synced 2026-04-06 03:00:16 -04:00
Resolved conflicts: - oauth-required-modal.tsx: removed local SCOPE_DESCRIPTIONS (moved to lib/oauth/utils) - credential-selector.tsx (2 files): kept useSettingsNavigation import, removed duplicate getMissingRequiredScopes - airtable.ts: combined HEAD's dependsOn/getSchema with staging's mode:'advanced' Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>