From 8688ae3ecbdab0b4d9e9e5e8b7dd2f10ecc8cbf1 Mon Sep 17 00:00:00 2001 From: lionsoul Date: Sat, 3 Nov 2018 11:05:48 +0800 Subject: [PATCH] Update the merge to version 1.2.1 --- binding/nodejs/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/binding/nodejs/package-lock.json b/binding/nodejs/package-lock.json index 52bc581..180b8e9 100644 --- a/binding/nodejs/package-lock.json +++ b/binding/nodejs/package-lock.json @@ -964,7 +964,7 @@ "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==", "dev": true, "requires": { - "merge": "^1.2.0" + "merge": "^1.2.1" } }, "expand-brackets": { @@ -2211,8 +2211,8 @@ "dev": true }, "merge": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=", "dev": true },