From a13def34a18f30bbfea7d7458417d6bade660846 Mon Sep 17 00:00:00 2001
From: Nikola Hristov <nikola@nikolahristov.tech>
Date: Fri, 29 Sep 2023 22:30:11 +0300
Subject: [PATCH] squash!

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

diff --git a/package.json b/package.json
index 5831bc8..56a61f0 100644
--- a/package.json
+++ b/package.json
@@ -20,11 +20,7 @@
 	},
 	"devDependencies": {
 		"@cloudflare/workers-types": "4.20230922.0",
-<<<<<<< HEAD
 		"typescript-esbuild": "0.2.1",
-=======
-		"typescript-esbuild": "0.1.16",
->>>>>>> 5620167a1137d6326972deada1dbee99ab791dd0
 		"wrangler": "3.10.1"
 	},
 	"publishConfig": {