From: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 23 Aug 2020 13:42:18 +0000 (+0800)
Subject: build(deps-dev): bump webpack-merge from 5.1.1 to 5.1.2 in /html (#449)
X-Git-Url: http://git.prime8.dev/?a=commitdiff_plain;h=f6bca1912d2ef974191dbd26f4788676530edf49;p=ttyd.git

build(deps-dev): bump webpack-merge from 5.1.1 to 5.1.2 in /html (#449)

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.1.1...v5.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---

diff --git a/html/package.json b/html/package.json
index ce4d3e9..80fa757 100644
--- a/html/package.json
+++ b/html/package.json
@@ -58,7 +58,7 @@
     "webpack": "4.44.1",
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0",
-    "webpack-merge": "^5.1.1"
+    "webpack-merge": "^5.1.2"
   },
   "dependencies": {
     "backoff": "^2.5.0",
diff --git a/html/yarn.lock b/html/yarn.lock
index 03bcebd..2aa1a81 100644
--- a/html/yarn.lock
+++ b/html/yarn.lock
@@ -8465,10 +8465,10 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-merge@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.1.tgz#c79f36b4ad39a597c3bb780f809b514d65d85d01"
-  integrity sha512-UhIkHAVqeG9EqFfYo7dRELrVfH6HYaOTYM7ssKCwfIIHYnWepGVOFp1E166GwgPGFqV6M68UgRiKOERjVOKIXA==
+webpack-merge@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.2.tgz#21dc1ed0e860c305cf5a07a48750f53a99750855"
+  integrity sha512-/slG0Kh0OKTf0zxdFJlhQHzv8bU9gUYVK5DkBjB3i/yoc1Xx4ADG0KITGO5S/6cqn2Ug43+8VR6Sz8daA/c+5g==
   dependencies:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"