Skip to content

Commit df49a1c

Browse files
committed
Resolve package update conflict
Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
1 parent 62bee11 commit df49a1c

2 files changed

Lines changed: 27 additions & 35 deletions

File tree

‎package.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,13 @@
2626
"@sveltejs/kit": "^2.70.3",
2727
"@sveltejs/vite-plugin-svelte": "^7.3.1",
2828
"@tailwindcss/vite": "^4.3.3",
29-
<<<<<<< before updating
30-
"@types/node": "^26.6.2",
31-
=======
3229
"@types/node": "^26.6.3",
33-
>>>>>>> after updating
3430
"oxfmt": "^0.70.0",
3531
"oxlint": "^1.85.0",
3632
"svelte": "^5.57.1",
3733
"svelte-check": "^4.7.6",
3834
"tailwindcss": "^4.3.3",
3935
"typescript": "^5.9.3",
40-
<<<<<<< before updating
41-
"vite": "^8.3.0"
42-
=======
4336
"vite": "^8.3.1"
44-
>>>>>>> after updating
4537
}
4638
}

‎pnpm-lock.yaml‎

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

0 commit comments

Comments
 (0)