Merge branch 'master' into dev/0.7

* master: (fix) build error, removing eslint-plugin-promise # Conflicts: # package.json
jstty · Nov 14, 2016 · 461af5e · 461af5e
2 parents a16af69 + efbb8c8
commit 461af5e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -70,7 +70,6 @@
     "coveralls": "~2.11.15",
     "eslint": "~3.10.0",
     "eslint-config-standard": "~6.2.1",
-    "eslint-plugin-promise": "~3.3.2",
     "eslint-plugin-standard": "~2.0.0",
     "freeport": "~1.0.5",
     "is-es6": "~1.0.0",