squash!

PlayForm · Mar 28, 2024 · 4c4ad63 · 4c4ad63
1 parent 03ce99b
commit 4c4ad63
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -22,11 +22,7 @@
 	"devDependencies": {
 		"@cloudflare/workers-types": "4.20240320.1",
 		"typescript-document": "0.0.7",
-<<<<<<< HEAD
 		"typescript-esbuild": "0.4.9",
-=======
-		"typescript-esbuild": "0.4.8",
->>>>>>> a677c0bee84ce1445c31e5574734574b126421d3
 		"wrangler": "3.39.0"
 	},
 	"publishConfig": {