Skip to content

Commit 9daada3

Browse files
Duncanwpfleger96
andcommitted
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

File tree

desktop/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
"qrcode": "^1.5.4",
7575
"qrcode.react": "^4.2.0",
7676
"react": "^19.1.0",
77+
"react-day-picker": "^10.0.1",
7778
"react-diff-view": "^3.3.2",
7879
"react-dom": "^19.1.0",
7980
"react-markdown": "^10.1.0",

pnpm-lock.yaml

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)