Merge pull request #4687 from storybooks/dependabot/npm_and_yarn/docs…

…/merge-1.2.1 [Security] Bump merge from 1.2.0 to 1.2.1 in /docs
storybookjs · Nov 5, 2018 · 97eecb7 · 97eecb7
2 parents 53f189f + ac68f3a
commit 97eecb7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/docs/yarn.lock b/docs/yarn.lock
@@ -8812,9 +8812,9 @@ merge2@^1.2.1:
   integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
 
 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"