Merge pull request #61 from leandrowd/dependabot/npm_and_yarn/merge-1…

….2.1 Bump merge from 1.2.0 to 1.2.1
leandrowd · Jul 2, 2021 · 978d1b8 · 978d1b8
2 parents 7f74fa2 + ae97d74
commit 978d1b8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -3139,8 +3139,9 @@ memory-fs@~0.3.0:
     readable-stream "^2.0.1"
 
 merge@^1.1.3:
-  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"
+  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
 micromatch@^2.1.5:
   version "2.3.11"