Merge pull request lijinke666#8 from lijinke666/dependabot/npm_and_ya…

…rn/merge-1.2.1 build(deps): bump merge from 1.2.0 to 1.2.1
shi7 · Dec 29, 2019 · 83f7740 · 83f7740
2 parents 5bc4829 + dd46a55
commit 83f7740
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -5206,8 +5206,8 @@ merge-stream@^1.0.0:
     readable-stream "^2.0.1"
 
 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"
 
 methods@~1.1.2:
   version "1.1.2"