From 86c9b029686a4e1ff745db39c088d338134a0049 Mon Sep 17 00:00:00 2001
From: Nikola Hristov <nikola@nikolahristov.tech>
Date: Mon, 1 Jan 2024 23:56:57 +0200
Subject: [PATCH] squash!

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

diff --git a/package.json b/package.json
index 641f3777..7791cd9e 100644
--- a/package.json
+++ b/package.json
@@ -39,11 +39,7 @@
 		"esbuild": "0.19.11",
 		"esbuild-plugin-copy": "2.1.1",
 		"fast-glob": "3.3.2",
-<<<<<<< HEAD
-		"typedoc": "0.25.5",
-=======
 		"typedoc": "0.25.6",
->>>>>>> bc84706db4a64de806fc06a9ad1f20066eb37eff
 		"typedoc-plugin-keywords": "1.6.0",
 		"typedoc-plugin-mdn-links": "3.1.10",
 		"typedoc-plugin-merge-modules": "5.1.0",