diff --git a/yarn.lock b/yarn.lock index b9f0152b..f09c2aa2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2887,9 +2887,9 @@ marked@^0.3.6, marked@~0.3.6: integrity sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc= merge@^1.1.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" - integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo= + version "1.2.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" + integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== micromatch@^2.1.5, micromatch@^2.3.11: version "2.3.11"