Merge pull request #6 from micleners/dependabot/npm_and_yarn/merge-1.2.1

Bump merge from 1.2.0 to 1.2.1
micleners · Jan 7, 2020 · a6fcae7 · a6fcae7
2 parents a13af8d + c822241
commit a6fcae7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -6045,8 +6045,9 @@ merge2@^1.2.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34"
 
 merge@^1.2.0:
-  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==
 
 methods@~1.1.2:
   version "1.1.2"