Merge pull request #9 from ciex/dependabot/npm_and_yarn/client/merge-…

…1.2.1 Bump merge from 1.2.0 to 1.2.1 in /client
cafca · Feb 18, 2020 · aecd7e1 · aecd7e1
2 parents 2f04980 + 6bb67eb
commit aecd7e1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/client/yarn.lock b/client/yarn.lock
@@ -6443,9 +6443,9 @@ merge-stream@^1.0.1:
     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"
-  integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
 methods@~1.1.2:
   version "1.1.2"