From 3cdd0c8025ff452a1af9a82e245a595f3d686f1b Mon Sep 17 00:00:00 2001
From: Charles Lechasseur <shiftingbeard@outlook.com>
Date: Sun, 12 Jan 2025 01:21:10 -0500
Subject: [PATCH] chore: fix rebase

---
 package-lock.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b705fb04..fcb0d94a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,12 +13,8 @@
         "string-argv": "^0.3.2"
       },
       "devDependencies": {
-<<<<<<< HEAD
-        "@types/node": "^20.17.12",
-=======
         "@types/jest": "^29.5.14",
-        "@types/node": "^20.17.11",
->>>>>>> 09c1659 (chore: update to `rs-actions-core` 5.0.0, fix issues, add tests)
+        "@types/node": "^20.17.12",
         "@vercel/ncc": "^0.38.3",
         "jest": "^29.7.0",
         "prettier": "^3.4.2",