Fixing merge conflicts

This commit is contained in:
Chris Troutner
2020-01-27 13:50:54 -08:00
2 changed files with 679 additions and 890 deletions
+2 -2
View File
@@ -35,8 +35,8 @@
"express-rate-limit": "^5.0.0",
"helmet": "^3.21.2",
"level": "^6.0.0",
"mkdirp": "^0.5.1",
"mocha": "^6.1.4",
"mkdirp": "^1.0.0",
"mocha": "^7.0.1",
"morgan": "^1.9.1",
"mqtt": "^3.0.0",
"passport": "^0.4.0",