Commit 68980b4
committed
Merge remote-tracking branch 'origin/refactor/dropdown' into refactor/dropdown
# Conflicts:
# client/components/Dropdown/DropdownMenu.jsx
# client/components/Dropdown/TableDropdown.jsx
# client/modules/IDE/components/CollectionList/CollectionListRow.jsx
# client/modules/IDE/components/__snapshots__/SketchList.unit.test.jsx.snapFile tree
1 file changed
+6
-0
lines changed- client/modules/IDE/components/CollectionList
1 file changed
+6
-0
lines changedLines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
19 | 25 | | |
20 | 26 | | |
21 | 27 | | |
| |||
0 commit comments