From 0afd9539cad8853315b3c4463e4061fb098b920c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2019 03:00:24 +0000
Subject: [PATCH] Bump merge from 1.2.0 to 1.2.1 in /demo

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)
---
 demo/package-lock.json | 6 +++---
 demo/yarn.lock         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/demo/package-lock.json b/demo/package-lock.json
index 9931f52..e995938 100644
--- a/demo/package-lock.json
+++ b/demo/package-lock.json
@@ -6204,9 +6204,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=="
     },
     "merge-descriptors": {
       "version": "1.0.1",
diff --git a/demo/yarn.lock b/demo/yarn.lock
index fc294f2..9c7c6bc 100644
--- a/demo/yarn.lock
+++ b/demo/yarn.lock
@@ -3638,8 +3638,8 @@ merge-stream@^1.0.1:
     readable-stream "^2.0.1"
 
 merge@^1.1.3:
-  version "1.2.0"
-  resolved "http://registry.npm.taobao.org/merge/download/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
 
 method-override@~2.3.5:
   version "2.3.10"