resolve conflict

This commit is contained in:
sharpy66 2023-11-26 00:37:22 -08:00 committed by GitHub
parent 46d92784f9
commit 8e49ba77ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -12,7 +12,7 @@
}, },
"dependencies": { "dependencies": {
"checkenv": "^1.2.2", "checkenv": "^1.2.2",
"discord.js": "^14.13.0", "discord.js": "^14.14.1",
"gsmarena-api": "github:nordmarin/gsmarena-api#master", "gsmarena-api": "github:nordmarin/gsmarena-api#master",
"ip": "^1.1.8", "ip": "^1.1.8",
"logdna": "^3.5.3", "logdna": "^3.5.3",