Skip to content

Commit a4b8f83

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

2 files changed

Lines changed: 46 additions & 256 deletions

File tree

‎package.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,15 @@
5151
"@sveltejs/kit": "^2.70.3",
5252
"@sveltejs/package": "^2.5.8",
5353
"@sveltejs/vite-plugin-svelte": "^7.3.1",
54-
<<<<<<< before updating
55-
"@types/node": "^26.6.2",
56-
=======
5754
"@types/node": "^26.6.3",
58-
>>>>>>> after updating
5955
"jsdom": "^30.1.1",
6056
"oxfmt": "^0.70.0",
6157
"oxlint": "^1.85.0",
6258
"publint": "^0.3.24",
6359
"svelte": "^5.57.1",
6460
"svelte-check": "^4.7.6",
65-
<<<<<<< before updating
66-
"typescript": "^7.0.2",
67-
"vite": "^8.3.0",
68-
=======
6961
"typescript": "^5.9.3",
7062
"vite": "^8.3.1",
71-
>>>>>>> after updating
7263
"vitest": "^5.0.1"
7364
}
7465
}

0 commit comments

Comments
 (0)