merge conflict resolved

b7908d29 · nilanjandaw · d34e3346 · c8823720 · b7908d29
Commit b7908d29 authored Jan 28, 2020 by nilanjandaw
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

dispatcher/package.json dispatcher/package.json +1 -0

No files found.
--- a/dispatcher/package.json
+++ b/dispatcher/package.json
@@ -15,6 +15,7 @@
    "express-fileupload": "^1.1.6",
    "isolated-vm": "^3.0.0",
    "morgan": "^1.9.1",
+    "mqtt": "^3.0.0",
    "nano": "^8.1.0",
    "redis": "^2.8.0",
    "save": "^2.4.0"