From b78db1e38e264561a6315da27b8f942309731776 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Mar 2020 07:26:06 +0000 Subject: [PATCH] Bump merge from 1.2.0 to 1.2.1 in /7-EOSblog/react-frontend 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] --- 7-EOSblog/react-frontend/yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 7-EOSblog/react-frontend/yarn.lock diff --git a/7-EOSblog/react-frontend/yarn.lock b/7-EOSblog/react-frontend/yarn.lock old mode 100755 new mode 100644 index 701d070..38b51e0 --- a/7-EOSblog/react-frontend/yarn.lock +++ b/7-EOSblog/react-frontend/yarn.lock @@ -1687,7 +1687,7 @@ compressible@~2.0.13: compression@^1.5.2: version "1.7.2" - resolved "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69" + resolved "https://registry.npmjs.org/compression/-/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69" dependencies: accepts "~1.3.4" bytes "3.0.0" @@ -2367,7 +2367,7 @@ eosjs-ecc@4.0.2: ecurve "^1.0.5" randombytes "^2.0.5" -eosjs@^15.0.6: +eosjs@^15.0.3: version "15.0.6" resolved "https://registry.yarnpkg.com/eosjs/-/eosjs-15.0.6.tgz#4180fa8baa5b2e838941cc47d37fa4f1a36e80c3" dependencies: @@ -4641,8 +4641,8 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" 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"