mirror of
https://github.com/citra-emu/discord-bot.git
synced 2024-12-23 05:15:28 +00:00
resolve conflict
This commit is contained in:
parent
46d92784f9
commit
8e49ba77ff
|
@ -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",
|
||||||
|
|
Loading…
Reference in a new issue