From 311270f693c02d679e4591440e9971219a36374f Mon Sep 17 00:00:00 2001
From: Nikola Hristov <Nikola@PlayForm.Cloud>
Date: Sun, 21 Jul 2024 15:08:12 +0300
Subject: [PATCH]

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

diff --git a/package.json b/package.json
index b7ebbaa3..e6a799e3 100644
--- a/package.json
+++ b/package.json
@@ -49,13 +49,8 @@
 		"postcss-import": "16.1.0",
 		"postcss-reporter": "7.1.0",
 		"postcss-url": "10.1.3",
-<<<<<<< HEAD
 		"tailwindcss": "*",
-		"typescript": "5.5.3",
-=======
-		"tailwindcss": "3.4.6",
 		"typescript": "5.6.0-dev.20240719",
->>>>>>> d5b037a1277c162bd437c6b788ae481fd13ba851
 		"zod": "3.23.8"
 	},
 	"publishConfig": {