From c3e244030a7b3cd59a622a6ba793d510f7062596 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 03:08:39 +0000
Subject: [PATCH] Bump merge in /data/tools/Remote Access/Diagon-0.1.0/UI

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] <support@github.com>
---
 data/tools/Remote Access/Diagon-0.1.0/UI/package-lock.json | 6 +++---
 data/tools/Remote Access/Diagon-0.1.0/UI/yarn.lock         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/tools/Remote Access/Diagon-0.1.0/UI/package-lock.json b/data/tools/Remote Access/Diagon-0.1.0/UI/package-lock.json
index ecad918..601d8cf 100644
--- a/data/tools/Remote Access/Diagon-0.1.0/UI/package-lock.json	
+++ b/data/tools/Remote Access/Diagon-0.1.0/UI/package-lock.json	
@@ -13632,9 +13632,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-descriptors": {
diff --git a/data/tools/Remote Access/Diagon-0.1.0/UI/yarn.lock b/data/tools/Remote Access/Diagon-0.1.0/UI/yarn.lock
index 207e167..1929b7b 100644
--- a/data/tools/Remote Access/Diagon-0.1.0/UI/yarn.lock	
+++ b/data/tools/Remote Access/Diagon-0.1.0/UI/yarn.lock	
@@ -8028,8 +8028,8 @@ merge2@^1.2.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34"
 
 merge@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
 
 methods@~1.1.2:
   version "1.1.2"