diff --git a/yarn.lock b/yarn.lock index 897fd67..22d5559 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3328,8 +3328,8 @@ merge-descriptors@1.0.1, merge-descriptors@~1.0.0: resolved "http://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" 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.7"