Upgrade npm-run-all. Fixes transitive dependencies (microsoft#657)

lupine86 · Feb 26, 2019 · ede968d · ede968d
1 parent 77a7234
commit ede968d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 132 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -89,8 +89,12 @@
     "husky": "^1.1.3",
     "lint-staged": "^8.0.4",
     "mocha": "5.2.0",
+<<<<<<< HEAD
     "mocha-junit-reporter": "^1.18.0",
     "npm-run-all": "^4.1.3",
+=======
+    "npm-run-all": "^4.1.5",
+>>>>>>> a58f3d5... Upgrade npm-run-all. Fixes transitive dependencies (#657)
     "prettier": "1.15.0",
     "rimraf": "^2.6.2",
     "strip-json-comments": "^2.0.1",