From 404c9f81c976f84c77d7086dfbc2437297caabec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2019 16:00:42 +0000 Subject: [PATCH] Bump merge from 1.2.0 to 1.2.1 in /Generator/generator-botbuilder-java Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/yeikos/js.merge/releases) - [Commits](https://github.com/yeikos/js.merge/compare/v1.2.0...v1.2.1) Signed-off-by: dependabot[bot] --- Generator/generator-botbuilder-java/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Generator/generator-botbuilder-java/package-lock.json b/Generator/generator-botbuilder-java/package-lock.json index db87631d8..fb7cca3e1 100644 --- a/Generator/generator-botbuilder-java/package-lock.json +++ b/Generator/generator-botbuilder-java/package-lock.json @@ -5253,9 +5253,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": {