summaryrefslogtreecommitdiff
path: root/examples/framework-multiple
diff options
context:
space:
mode:
Diffstat (limited to 'examples/framework-multiple')
-rw-r--r--examples/framework-multiple/package.json11
1 files changed, 10 insertions, 1 deletions
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index b6def4f16..5f4639bbd 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -9,6 +9,8 @@
"preview": "astro preview",
"astro": "astro"
},
+<<<<<<< HEAD
+=======
"devDependencies": {
"@astrojs/preact": "^1.0.2",
"@astrojs/react": "^1.1.1",
@@ -17,12 +19,19 @@
"@astrojs/vue": "^1.0.0",
"astro": "^1.1.2"
},
+>>>>>>> main
"dependencies": {
+ "astro": "^1.1.1",
"preact": "^10.7.3",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"solid-js": "^1.4.3",
"svelte": "^3.48.0",
- "vue": "^3.2.37"
+ "vue": "^3.2.37",
+ "@astrojs/preact": "^1.0.2",
+ "@astrojs/react": "^1.1.0",
+ "@astrojs/solid-js": "^1.1.0",
+ "@astrojs/svelte": "^1.0.0",
+ "@astrojs/vue": "^1.0.0"
}
}