From f69fae43035afa6e53230af129794db7000e78dc Mon Sep 17 00:00:00 2001 From: mrugesh mohapatra <1884376+raisedadead@users.noreply.github.com> Date: Fri, 16 Nov 2018 21:50:20 +0530 Subject: [PATCH] chore: update package and lockfile (#34352) --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2e095eb43d..9bf340e032 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7020,9 +7020,9 @@ } }, "merge": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", - "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==", "dev": true }, "merge-stream": { diff --git a/package.json b/package.json index 419ee70d5c..882c8e7622 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "lint": "echo 'Warning: TODO - Define Linting with fixing.'", "seed": "npm-run-all -p seed:*", "seed:challenges": "cross-env DEBUG=fcc:* node ./tools/scripts/seed/seedChallenges", - "seed:news":"cross-env DEBUG=fcc:* node ./tools/scripts/seed/seedNewsArticles", + "seed:news": "cross-env DEBUG=fcc:* node ./tools/scripts/seed/seedNewsArticles", "start-develop": "node ./tools/scripts/start-develop.js", "pretest": "npm-run-all -s test:lint", "test": "npm-run-all -p test:*",