diff --git a/yarn.lock b/yarn.lock index 35507ac..8dda210 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3006,8 +3006,8 @@ merge-stream@^1.0.1: readable-stream "^2.0.1" 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.10"