From 6e6865662947abc2193e7edb3705539985f52925 Mon Sep 17 00:00:00 2001
From: Diamond Lewis <findlewis@gmail.com>
Date: Sun, 3 Jul 2022 04:33:30 -0500
Subject: [PATCH] refactor: upgrade @graphql-tools/merge from 8.2.13 to 8.2.14
 (#8085)

---
 package-lock.json | 18 +++++++++---------
 package.json      |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fa5be02c12..e4f251fae8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1152,20 +1152,20 @@
       }
     },
     "@graphql-tools/merge": {
-      "version": "8.2.13",
-      "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.13.tgz",
-      "integrity": "sha512-lhzjCa6wCthOYl7B6UzER3SGjU2WjSGnW0WGr8giMYsrtf6G3vIRotMcSVMlhDzyyMIOn7uPULOUt3/kaJ/rIA==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.14.tgz",
+      "integrity": "sha512-od6lTF732nwPX91G79eiJf+dyRBHxCaKe7QL4IYeH4d1k+NYqx/ihYpFJNjDaqxmpHH92Hr+TxsP9SYRK3/QKg==",
       "requires": {
-        "@graphql-tools/utils": "8.6.12",
-        "tslib": "~2.4.0"
+        "@graphql-tools/utils": "8.6.13",
+        "tslib": "^2.4.0"
       },
       "dependencies": {
         "@graphql-tools/utils": {
-          "version": "8.6.12",
-          "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.12.tgz",
-          "integrity": "sha512-WQ91O40RC+UJgZ9K+IzevSf8oolR1QE+WQ21Oyc2fgDYYiqT0eSf+HVyhZr/8x9rVjn3N9HeqCsywbdmbljg0w==",
+          "version": "8.6.13",
+          "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.13.tgz",
+          "integrity": "sha512-FiVqrQzj4cgz0HcZ3CxUs8NtBGPZFpmsVyIgwmL6YCwIhjJQnT72h8G3/vk5zVfjfesht85YGp0inWWuoCKWzg==",
           "requires": {
-            "tslib": "~2.4.0"
+            "tslib": "^2.4.0"
           }
         }
       }
diff --git a/package.json b/package.json
index 8c947a1a8f..76c143c552 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "@graphql-yoga/node": "2.6.0",
     "@graphql-tools/utils": "8.6.13",
-    "@graphql-tools/merge": "8.2.13",
+    "@graphql-tools/merge": "8.2.14",
     "@graphql-tools/schema": "8.3.14",
     "@parse/fs-files-adapter": "1.2.2",
     "@parse/push-adapter": "4.1.2",