Commit 9daada3
chore(desktop): rebase onto main — add react-day-picker, retain diff dep
Mechanical conflict resolution: origin/main added react-day-picker (status
indicators, #7112) while this branch replaced date-fns with diff (canvas
diff view). Merged result keeps both react-day-picker and diff, removes
date-fns from the desktop importer.
Co-authored-by: Will Pfleger <pfleger.will@gmail.com>
Signed-off-by: Will Pfleger <pfleger.will@gmail.com>1 parent 5e27e91 commit 9daada3
2 files changed
Lines changed: 32 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| 77 | + | |
77 | 78 | | |
78 | 79 | | |
79 | 80 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments