github/TheGame
1
1
Fork 0
mirror of https://github.com/MetaFam/TheGame.git synced 2026-04-24 03:00:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rebased

Browse Source
This commit is contained in:
Alec LaLonde
2021-05-01 23:27:19 -06:00
committed by Alec LaLonde
parent 2efaf525b2
commit 658aeb4c14
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/discord-bot/package.json
View File

@@ -31,15 +31,9 @@
"sourcecred": "0.8.5"
},
"devDependencies": {
<<<<<<< 1cf63eba00e595bb937de6ddc5df2196eecacb07
"@types/express": "4.17.11",
"@types/node-fetch": "2.5.10",
"concurrently": "6.0.2",
"ts-node-dev": "1.1.6"
=======
"@types/express": "^4.17.11",
"@types/node-fetch": "2.5.7",
"concurrently": "5.3.0",
"ts-node-dev": "1.1.1"
>>>>>>> Fixed docker build
}
}

2
yarn.lock
View File

@@ -6042,7 +6042,7 @@
"@types/qs" "*"
"@types/range-parser" "*"
"@types/express@^4.17.11":
"@types/express@4.17.11":
version "4.17.11"
resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==