Merge pull request #86 from coderwall/dependabot/npm_and_yarn/client/merge-1.2.1

usiegj00 · web-flow · commit 5f386b58a662 · 2019-12-12T19:41:00.000+09:00
Bump merge from 1.2.0 to 1.2.1 in /client
diff --git a/client/yarn.lock b/client/yarn.lock
@@ -3841,8 +3841,8 @@ merge-descriptors@1.0.1:
   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"
