From b30094991986fc43550d50775ea696758e30026c Mon Sep 17 00:00:00 2001
From: Nikola Hristov <Nikola@PlayForm.LTD>
Date: Wed, 15 Jan 2025 07:57:01 +0200
Subject: [PATCH]

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

diff --git a/package.json b/package.json
index c174d47e..ae820a00 100644
--- a/package.json
+++ b/package.json
@@ -29,11 +29,7 @@
 		"@tailwindcss/aspect-ratio": "0.4.2",
 		"@tailwindcss/forms": "0.5.10",
 		"@tailwindcss/typography": "0.5.16",
-<<<<<<< HEAD
 		"astro": "5.1.6",
-=======
-		"astro": "5.1.5",
->>>>>>> 4762acebf092d7df2081940fa65f6f81ee56099c
 		"astro-capo": "0.0.1",
 		"astrojs-service-worker": "2.0.0",
 		"autoprefixer": "10.4.20",