Merge pull request #23 from condense/dependabot/npm_and_yarn/merge-1.2.1

Bump merge from 1.2.0 to 1.2.1
condense · Dec 28, 2019 · 51c0f0c · 51c0f0c
2 parents d2bb366 + c4da3eb
commit 51c0f0c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -4878,8 +4878,8 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
 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"
 
 methods@~1.1.2:
   version "1.1.2"