squash!

GrenadierJS · Jun 11, 2024 · 5e7fbbb · 5e7fbbb
1 parent a9f32c3
commit 5e7fbbb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -31,11 +31,7 @@
 		"@tailwindcss/aspect-ratio": "0.4.2",
 		"@tailwindcss/forms": "0.5.7",
 		"@tailwindcss/typography": "0.5.13",
-<<<<<<< HEAD
 		"astro": "4.10.2",
-=======
-		"astro": "4.10.1",
->>>>>>> 7ec82d2e51385668f97b24f7a2641b66d8ff27ea
 		"astro-capo": "0.0.1",
 		"astrojs-service-worker": "2.0.0",
 		"autoprefixer": "10.4.19",