From b22437fe670649a57ce9f4f02ced48fe383e10c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 08:44:51 +0000 Subject: [PATCH] Bump merge from 1.2.1 to 2.1.1 in /client Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.1 to 2.1.1. - [Release notes](https://github.com/yeikos/js.merge/releases) - [Commits](https://github.com/yeikos/js.merge/compare/v1.2.1...v2.1.1) Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/package.json b/client/package.json index 504f2ea..c992888 100644 --- a/client/package.json +++ b/client/package.json @@ -15,7 +15,7 @@ "immutable": "3.7.4", "js-cookie": "^2.2.0", "lodash": "^4.17.13", - "merge": "1.2.1", + "merge": "2.1.1", "moment": "^2.22.0", "prop-types": "15.6.0", "react": "^16.5.1", diff --git a/client/yarn.lock b/client/yarn.lock index dc837ab..008c0f7 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -6674,9 +6674,10 @@ merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" -merge@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" +merge@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98" + integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w== merge@^1.2.0: version "1.2.0"