0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-01-27 22:19:04 -05:00

fix merge mistake during resolution

This commit is contained in:
Emanuele Stoppa 2024-10-17 15:13:00 +01:00
parent 58d1d9e000
commit 2649a73d0c
2 changed files with 3 additions and 8 deletions

View file

@ -15,7 +15,7 @@
], ],
"scripts": {}, "scripts": {},
"devDependencies": { "devDependencies": {
"astro": "^5.0.0-beta.6" "astro": "^5.0.0-beta.5"
}, },
"peerDependencies": { "peerDependencies": {
"astro": "^4.0.0 || ^5.0.0" "astro": "^4.0.0 || ^5.0.0"

9
pnpm-lock.yaml generated
View file

@ -8,11 +8,6 @@ overrides:
vitest>vite: 6.0.0-beta.2 vitest>vite: 6.0.0-beta.2
vite-node>vite: 6.0.0-beta.2 vite-node>vite: 6.0.0-beta.2
patchedDependencies:
fs-fixture@2.4.0:
hash: hvkuaks2ic76pdflr3iifgi4ku
path: patches/fs-fixture@2.4.0.patch
importers: importers:
.: .:
@ -684,7 +679,7 @@ importers:
version: 1.1.0 version: 1.1.0
fs-fixture: fs-fixture:
specifier: ^2.4.0 specifier: ^2.4.0
version: 2.4.0(patch_hash=hvkuaks2ic76pdflr3iifgi4ku) version: 2.4.0
mdast-util-mdx: mdast-util-mdx:
specifier: ^3.0.0 specifier: ^3.0.0
version: 3.0.0 version: 3.0.0
@ -13911,7 +13906,7 @@ snapshots:
jsonfile: 4.0.0 jsonfile: 4.0.0
universalify: 0.1.2 universalify: 0.1.2
fs-fixture@2.4.0(patch_hash=hvkuaks2ic76pdflr3iifgi4ku): {} fs-fixture@2.4.0: {}
fsevents@2.3.2: fsevents@2.3.2:
optional: true optional: true