No commit message

PlayForm · Jul 21, 2024 · 311270f · 311270f
1 parent 6b7292b
commit 311270f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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": {