From 1a82cf2a74b97122ebd51b1437fee448c227bf7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Sep 2020 02:29:57 +0000
Subject: [PATCH] Bump lodash.merge from 4.6.1 to 4.6.2

Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

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

diff --git a/package.json b/package.json
index 4348e46..bc83ba8 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "btoa": "^1.2.1",
     "jasmine-spec-reporter": "^4.2.1",
     "json5": "^1.0.1",
-    "lodash.merge": "^4.6.1",
+    "lodash.merge": "^4.6.2",
     "minimist": "^1.2.0",
     "mysql2": "^1.5.3",
     "uws": "^9.147.0"
diff --git a/yarn.lock b/yarn.lock
index 0685d3e..b0ba813 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -425,9 +425,9 @@ levelup@~0.19.0:
     semver "~5.1.0"
     xtend "~3.0.0"
 
-lodash.merge@^4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
+lodash.merge@^4.6.1, lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
 
 long@^4.0.0:
   version "4.0.0"