Merge remote-tracking branch 'upstream/main'

# Conflicts: # package.json
PlayForm · Nov 28, 2023 · 1dd2ad6 · 1dd2ad6
2 parents c2e7d6c + 53681c9
commit 1dd2ad6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -34,7 +34,11 @@
 		"@tailwindcss/aspect-ratio": "0.4.2",
 		"@tailwindcss/forms": "0.5.7",
 		"@tailwindcss/typography": "0.5.10",
+<<<<<<< HEAD
 		"astro": "3.6.2",
+=======
+		"astro": "3.6.1",
+>>>>>>> upstream/main
 		"astro-capo": "0.0.1",
 		"astro-compress": "2.2.3",
 		"astro-critters": "2.0.11",