ulysia/site
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

resolve merge conflict

Browse source
This commit is contained in:
Heli-o 2024-09-01 12:23:30 +02:00
parent e0f69af8d3 1207e43724
commit cd8c1bb7f1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package-lock.json generated
View file

@ -83,7 +83,7 @@
"esbuild": "^0.19.9", "esbuild": "^0.19.9",
"prettier": "^3.3.2", "prettier": "^3.3.2",
"tsx": "^4.18.0", "tsx": "^4.18.0",
"typescript": "^5.4.5" "typescript": "^5.5.4"
}, },
"engines": { "engines": {
"node": ">=18.14", "node": ">=18.14",
@ -6207,9 +6207,9 @@
} }
}, },
"node_modules/typescript": { "node_modules/typescript": {
"version": "5.4.5", "version": "5.5.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
"integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
"dev": true, "dev": true,
"bin": { "bin": {
"tsc": "bin/tsc", "tsc": "bin/tsc",

2
package.json
View file

@ -105,6 +105,6 @@
"esbuild": "^0.19.9", "esbuild": "^0.19.9",
"prettier": "^3.3.2", "prettier": "^3.3.2",
"tsx": "^4.18.0", "tsx": "^4.18.0",
"typescript": "^5.4.5" "typescript": "^5.5.4"
} }
} }