Merge pull request #10 from owsas/dependabot/npm_and_yarn/merge-1.2.1

Bump merge from 1.2.0 to 1.2.1
owsas · Apr 28, 2020 · 125008d · 125008d
2 parents c7491d6 + e69c06c
commit 125008d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -1637,8 +1637,8 @@ 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"
 
 micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"