squash!

PlayForm · Aug 31, 2023 · 05ec43e · 05ec43e
2 parents 355af48 + 0ccd22f
commit 05ec43e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,11 @@
 		"prepublishOnly": "TypeScriptESBuild 'Source/**/*.ts'"
 	},
 	"devDependencies": {
+<<<<<<< HEAD
 		"astro": "3.0.0",
+=======
+		"astro": "2.10.15",
+>>>>>>> 0ccd22fc7634193b9ece7c4a6cdf589054192a98
 		"typescript-esbuild": "0.1.15"
 	},
 	"publishConfig": {