squash!

PlayForm · Nov 29, 2023 · d150322 · d150322
1 parent 9ba5429
commit d150322
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -34,11 +34,7 @@
 		"@tailwindcss/aspect-ratio": "0.4.2",
 		"@tailwindcss/forms": "0.5.7",
 		"@tailwindcss/typography": "0.5.10",
-<<<<<<< HEAD
 		"astro": "3.6.2",
-=======
-		"astro": "3.6.3",
->>>>>>> upstream/main
 		"astro-capo": "0.0.1",
 		"astro-compress": "2.2.3",
 		"astro-critters": "2.0.11",