This commit is contained in:
Daniel Odendahl Jr
2017-10-01 22:54:45 +00:00
parent 5b346b0123
commit 5d92ea74c1
-7
View File
@@ -39,14 +39,7 @@
"erlpack": "github:discordapp/erlpack", "erlpack": "github:discordapp/erlpack",
"mathjs": "^3.16.4", "mathjs": "^3.16.4",
"node-opus": "^0.2.7", "node-opus": "^0.2.7",
<<<<<<< HEAD
"snekfetch": "^3.4.2", "snekfetch": "^3.4.2",
=======
"pg": "^6.4.2",
"pg-hstore": "^2.3.2",
"sequelize": "^4.13.1",
"snekfetch": "^3.4.2",
>>>>>>> 08785fdc8f0c24988f5a6c6ca60dd941f1b229fc
"uws": "^8.14.1", "uws": "^8.14.1",
"xml-js": "^1.4.2" "xml-js": "^1.4.2"
}, },