From bd2cc64551a04fb2490896f802e865f4c87222f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Mar 2021 15:16:30 +0000
Subject: [PATCH] build: bump @types/merge2 from 0.3.30 to 1.3.0

Bumps [@types/merge2](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/merge2) from 0.3.30 to 1.3.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/merge2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 05bab4116081..0ac8679e3f24 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "@types/inquirer": "^7.3.1",
     "@types/jasmine": "^3.6.0",
     "@types/marked": "^2.0.0",
-    "@types/merge2": "^0.3.30",
+    "@types/merge2": "^1.3.0",
     "@types/minimist": "^1.2.0",
     "@types/node": "^14.14.22",
     "@types/node-fetch": "^2.5.5",
diff --git a/yarn.lock b/yarn.lock
index e316681e8949..c454006a132a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1988,10 +1988,10 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/merge2@^0.3.30":
-  version "0.3.30"
-  resolved "https://registry.yarnpkg.com/@types/merge2/-/merge2-0.3.30.tgz#9e39d04f6fe4f36fa7477566cad1faf80b2a671f"
-  integrity sha1-njnQT2/k82+nR3VmytH6+AsqZx8=
+"@types/merge2@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@types/merge2/-/merge2-1.3.0.tgz#0152526e885184aead524698c42aeae5c85aa1e7"
+  integrity sha512-3xFWjsGhm5GCVlRrcrrVr9oapPxpbG5M3G/4JGF+Gra++7DWoeDOQphCEhyMpbpbptD3w/4PesYIMby/yHrzkQ==
   dependencies:
     "@types/node" "*"