Nikola Hristov · Nikola Hristov · commit 5370f48db65e · 2025-04-22T16:36:20.000+03:00
diff --git a/package.json b/package.json
@@ -23,11 +23,7 @@
 	},
 	"dependencies": {},
 	"devDependencies": {
-<<<<<<< HEAD
 		"@cloudflare/workers-types": "4.20250418.0",
-=======
-		"@cloudflare/workers-types": "4.20250417.0",
->>>>>>> 73045179ad80d03a662de08736557a4cadd64568
 		"@playform/build": "0.2.3"
 	},
 	"publishConfig": {
