Merge pull request #29 from nighca/dependabot/npm_and_yarn/merge-1.2.1

Bump merge from 1.2.0 to 1.2.1
nighca · Oct 23, 2019 · 12e7dcb · 12e7dcb
2 parents bedd1b0 + 36d2f92
commit 12e7dcb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/yarn.lock b/yarn.lock
@@ -1516,8 +1516,9 @@ mem@^1.1.0:
     mimic-fn "^1.0.0"
 
 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, micromatch@^2.3.11:
   version "2.3.11"