chore(merge): Resolve merge conflicts manually

storybookjs · Nov 6, 2019 · 128cca0 · 128cca0
1 parent 1bca9f3
commit 128cca0
Showing 1 changed file with 30 additions and 30 deletions.
diff --git a/lib/cli/package.json b/lib/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "5.3.0-alpha.39",
+  "version": "5.3.0-alpha.40",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@babel/core": "^7.4.5",
     "@babel/preset-env": "^7.4.5",
-    "@storybook/codemod": "5.3.0-alpha.39",
+    "@storybook/codemod": "5.3.0-alpha.40",
     "chalk": "^2.4.1",
     "commander": "^3.0.2",
     "core-js": "^3.0.1",
@@ -57,34 +57,34 @@
     "update-notifier": "^3.0.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "5.3.0-alpha.39",
-    "@storybook/addon-centered": "5.3.0-alpha.39",
-    "@storybook/addon-graphql": "5.3.0-alpha.39",
-    "@storybook/addon-info": "5.3.0-alpha.39",
-    "@storybook/addon-knobs": "5.3.0-alpha.39",
-    "@storybook/addon-links": "5.3.0-alpha.39",
-    "@storybook/addon-notes": "5.3.0-alpha.39",
-    "@storybook/addon-options": "5.3.0-alpha.39",
-    "@storybook/addon-storyshots": "5.3.0-alpha.39",
-    "@storybook/addons": "5.3.0-alpha.39",
-    "@storybook/angular": "5.3.0-alpha.39",
-    "@storybook/aurelia": "5.3.0-alpha.39",
-    "@storybook/channel-postmessage": "5.3.0-alpha.39",
-    "@storybook/channel-websocket": "5.3.0-alpha.39",
-    "@storybook/channels": "5.3.0-alpha.39",
-    "@storybook/ember": "5.3.0-alpha.39",
-    "@storybook/html": "5.3.0-alpha.39",
-    "@storybook/marko": "5.3.0-alpha.39",
-    "@storybook/mithril": "5.3.0-alpha.39",
-    "@storybook/polymer": "5.3.0-alpha.39",
-    "@storybook/preact": "5.3.0-alpha.39",
-    "@storybook/rax": "5.3.0-alpha.39",
-    "@storybook/react": "5.3.0-alpha.39",
-    "@storybook/react-native": "5.3.0-alpha.39",
-    "@storybook/riot": "5.3.0-alpha.39",
-    "@storybook/svelte": "5.3.0-alpha.39",
-    "@storybook/ui": "5.3.0-alpha.39",
-    "@storybook/vue": "5.3.0-alpha.39"
+    "@storybook/addon-actions": "5.3.0-alpha.40",
+    "@storybook/addon-centered": "5.3.0-alpha.40",
+    "@storybook/addon-graphql": "5.3.0-alpha.40",
+    "@storybook/addon-info": "5.3.0-alpha.40",
+    "@storybook/addon-knobs": "5.3.0-alpha.40",
+    "@storybook/addon-links": "5.3.0-alpha.40",
+    "@storybook/addon-notes": "5.3.0-alpha.40",
+    "@storybook/addon-options": "5.3.0-alpha.40",
+    "@storybook/addon-storyshots": "5.3.0-alpha.40",
+    "@storybook/addons": "5.3.0-alpha.40",
+    "@storybook/angular": "5.3.0-alpha.40",
+    "@storybook/aurelia": "5.3.0-alpha.40",
+    "@storybook/channel-postmessage": "5.3.0-alpha.40",
+    "@storybook/channel-websocket": "5.3.0-alpha.40",
+    "@storybook/channels": "5.3.0-alpha.40",
+    "@storybook/ember": "5.3.0-alpha.40",
+    "@storybook/html": "5.3.0-alpha.40",
+    "@storybook/marko": "5.3.0-alpha.40",
+    "@storybook/mithril": "5.3.0-alpha.40",
+    "@storybook/polymer": "5.3.0-alpha.40",
+    "@storybook/preact": "5.3.0-alpha.40",
+    "@storybook/rax": "5.3.0-alpha.40",
+    "@storybook/react": "5.3.0-alpha.40",
+    "@storybook/react-native": "5.3.0-alpha.40",
+    "@storybook/riot": "5.3.0-alpha.40",
+    "@storybook/svelte": "5.3.0-alpha.40",
+    "@storybook/ui": "5.3.0-alpha.40",
+    "@storybook/vue": "5.3.0-alpha.40"
   },
   "publishConfig": {
     "access": "public"