From 8e49ba77ff29b8b8111714355ed22d49497381c5 Mon Sep 17 00:00:00 2001
From: sharpy66 <40325290+sharpy66@users.noreply.github.com>
Date: Sun, 26 Nov 2023 00:37:22 -0800
Subject: [PATCH] resolve conflict

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1a2d9a0..80a13e9 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "checkenv": "^1.2.2",
-    "discord.js": "^14.13.0",
+    "discord.js": "^14.14.1",
     "gsmarena-api": "github:nordmarin/gsmarena-api#master",
     "ip": "^1.1.8",
     "logdna": "^3.5.3",