Commit 63aa37e
Merge commit '1d252e5ca01f07229c1462e2bf40575c0b814aca' into codex/resolve-7998-parent
# Conflicts:
# .claude/rules/emcn-components.md
# .cursor/rules/emcn-components.mdc
# packages/emcn/src/components/button/button.tsx3 files changed
Lines changed: 4 additions & 11 deletions
File tree
- apps/sim/app/workspace/[workspaceId]
- logs/components/log-details/components/file-download
- tables/[tableId]/components/table-grid
- packages/emcn/src/components/button
Lines changed: 1 addition & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
| 109 | + | |
114 | 110 | | |
115 | 111 | | |
116 | 112 | | |
| |||
Lines changed: 2 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
| 75 | + | |
| 76 | + | |
80 | 77 | | |
81 | 78 | | |
82 | 79 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
| 91 | + | |
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
| |||
0 commit comments