fix(core): Fix merge conflict

aethant · Mar 20, 2017 · 44f795a · 44f795a
2 parents d21d51e + 49ed720
commit 44f795a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -423,7 +423,7 @@
     "sax": "^1.2.1",
     "semver": "^5.3.0",
     "send": "^0.15.0",
-    "sequelize": "^3.24.4",
+    "sequelize": "^3.30.1",
     "serialport": "^4.0.4",
     "serve-favicon": "^2.3.0",
     "serve-static": "^1.11.2",