Skip to content

Commit eb8706e

Browse files
committed
Merge branch 'dev' of https://github.com/imaginer-dev/DateLeaf into 15-๋ฆฌ๋””๋ ‰์…˜๋œ-URL์—์„œ-๋น„๋ฐ€๋ฒˆํ˜ธ๋ฅผ-๋ณ€๊ฒฝํ• -์ˆ˜-์žˆ์–ด์•ผ-ํ•œ๋‹ค
## merge conflict ํ•ด๊ฒฐ - queryKeys.ts - pnpm-lock.yaml
2 parents b629dbe + ad50f91 commit eb8706e

27 files changed

+562
-180
lines changed

โ€Žpackage.jsonโ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
"prepare": "husky"
1616
},
1717
"dependencies": {
18+
"@fullcalendar/core": "^6.1.11",
19+
"@fullcalendar/daygrid": "^6.1.11",
20+
"@fullcalendar/interaction": "^6.1.11",
21+
"@fullcalendar/react": "^6.1.11",
1822
"@lukemorales/query-key-factory": "^1.3.4",
1923
"@supabase/supabase-js": "^2.42.7",
2024
"@tanstack/react-query": "^5.29.0",

โ€Žpnpm-lock.yamlโ€Ž

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

0 commit comments

Comments
ย (0)