diff --git a/ember-app-espire/yarn.lock b/ember-app-espire/yarn.lock index c705e35..10cf3fd 100644 --- a/ember-app-espire/yarn.lock +++ b/ember-app-espire/yarn.lock @@ -4586,8 +4586,8 @@ merge2@^1.2.1: resolved "http://registry.npm.taobao.org/merge2/download/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34" merge@^1.2.0: - 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" methods@~1.1.2: version "1.1.2"