engineering
/
community-relations
3
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 1 Wiki Activity

Conflict

merge-requests/9/merge
Bsian 2020-04-17 15:17:04 +01:00
parent 7e25f7ae70
commit 178aa9f37b
No known key found for this signature in database
GPG Key ID: 097FB9A291026091
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -22,11 +22,7 @@
}, },
"dependencies": { "dependencies": {
"axios": "^0.19.2", "axios": "^0.19.2",
<<<<<<< HEAD
"eris": "abalabahaha/eris#dev",
=======
"eris": "bsian03/eris#bsian", "eris": "bsian03/eris#bsian",
>>>>>>> dev
"moment": "^2.24.0", "moment": "^2.24.0",
"mongoose": "^5.9.9", "mongoose": "^5.9.9",
"signale": "^1.4.0", "signale": "^1.4.0",