Skip to content

Commit

Permalink
Fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
jaalah committed Sep 30, 2024
2 parents c0dfdc5 + e833b6d commit 6fc118c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"ts-node": "^10.9.2",
"tsup": "^8.2.4",
"typescript": "^5.6.2",
"vite": "^5.4.5"
"vite": "^5.4.6"
},
"volta": {
"node": "18.18.0"
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ __metadata:
ts-node: "npm:^10.9.2"
tsup: "npm:^8.2.4"
typescript: "npm:^5.6.2"
vite: "npm:^5.4.5"
vite: "npm:^5.4.6"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -7931,9 +7931,9 @@ __metadata:
languageName: node
linkType: hard

"vite@npm:^5.4.5":
version: 5.4.5
resolution: "vite@npm:5.4.5"
"vite@npm:^5.4.6":
version: 5.4.6
resolution: "vite@npm:5.4.6"
dependencies:
esbuild: "npm:^0.21.3"
fsevents: "npm:~2.3.3"
Expand Down Expand Up @@ -7970,7 +7970,7 @@ __metadata:
optional: true
bin:
vite: bin/vite.js
checksum: 10c0/89c6459452fc238cdf8e99681b30996af171c9c557af476f96408a18a639fb5a0a6ee2d2257e005b21dc284edceb604595c34920cd4a007ad18f7ebafb654c76
checksum: 10c0/5f87be3a10e970eaf9ac52dfab39cf9fff583036685252fb64570b6d7bfa749f6d221fb78058f5ef4b5664c180d45a8e7a7ff68d7f3770e69e24c7c68b958bde
languageName: node
linkType: hard

Expand Down

0 comments on commit 6fc118c

Please sign in to comment.