From fd0da3195a95fbf5c1737e3a34ba8fbb084124ce Mon Sep 17 00:00:00 2001
From: Nikola Hristov <nikola@nikolahristov.tech>
Date: Wed, 29 Nov 2023 01:05:19 +0200
Subject: [PATCH] squash!

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index d3b91970..110bb557 100644
--- a/package.json
+++ b/package.json
@@ -28,11 +28,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.1",
->>>>>>> upstream/main
 		"astro-capo": "0.0.1",
 		"astro-compress": "2.2.3",
 		"astro-critters": "2.0.11",