mirror of
https://github.com/simstudioai/sim.git
synced 2026-01-22 13:28:04 -05:00
Resolved conflicts: - workflow-block.tsx: Kept both table types and schedule hooks - types.ts: Kept both filter-builder/sort-builder and deprecated comment - icons.tsx (both apps): Kept TableIcon and added ReductoIcon/PulseIcon - Migration files: Accepted main branch versions