Merge f4f2cb1 into 1039b56

meetup · Jul 9, 2019 · b814006 · b814006
2 parents 1039b56 + f4f2cb1
commit b814006
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -2990,8 +2990,8 @@ 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"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
 
 micromatch@^2.3.11:
   version "2.3.11"