From 45b597b0a0e6afa19997745eaa6dd846ab9e3482 Mon Sep 17 00:00:00 2001
From: Nikola Hristov <nikola@nikolahristov.tech>
Date: Thu, 5 Oct 2023 02:08:41 +0300
Subject: [PATCH] squash!

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

diff --git a/package.json b/package.json
index 3c97f83..47d5b06 100644
--- a/package.json
+++ b/package.json
@@ -35,11 +35,7 @@
 		"files-pipe": "2.0.19"
 	},
 	"devDependencies": {
-<<<<<<< HEAD
 		"typescript-esbuild": "0.2.14"
-=======
-		"typescript-esbuild": "0.2.13"
->>>>>>> cb26cce1061615217aaafd02294b7dcbf348a338
 	},
 	"publishConfig": {
 		"access": "public"