Skip to content

Commit

Permalink
Fix merge shenigans
Browse files Browse the repository at this point in the history
  • Loading branch information
kasperpeulen committed Apr 12, 2024
1 parent fc47bfb commit cf2e5b9
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion code/addons/links/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-links",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"description": "Link stories together to build demos and prototypes with your UI components",
"keywords": [
"addon",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/codemod/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/codemod",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"description": "A collection of codemod scripts written with JSCodeshift",
"keywords": [
"storybook"
Expand Down
2 changes: 1 addition & 1 deletion code/lib/core-server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/core-server",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"description": "Storybook framework-agnostic API",
"keywords": [
"storybook"
Expand Down
2 changes: 1 addition & 1 deletion code/lib/csf-tools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/csf-tools",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"description": "Parse and manipulate CSF and Storybook config files",
"keywords": [
"storybook"
Expand Down
2 changes: 1 addition & 1 deletion code/lib/manager-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/manager-api",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"description": "Core Storybook Manager API & Context",
"keywords": [
"storybook"
Expand Down
2 changes: 1 addition & 1 deletion code/lib/preview-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/preview-api",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"description": "",
"keywords": [
"storybook"
Expand Down
2 changes: 1 addition & 1 deletion code/lib/source-loader/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/source-loader",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"description": "Source loader",
"keywords": [
"lib",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/types/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/types",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"description": "Core Storybook TS Types",
"keywords": [
"storybook"
Expand Down
2 changes: 1 addition & 1 deletion code/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/root",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"private": true,
"description": "Storybook root",
"homepage": "https://storybook.js.org/",
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/server",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"description": "Storybook Server renderer",
"keywords": [
"storybook"
Expand Down
2 changes: 1 addition & 1 deletion code/ui/blocks/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/blocks",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"description": "Storybook Doc Blocks",
"keywords": [
"storybook"
Expand Down
2 changes: 1 addition & 1 deletion code/ui/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/components",
"version": "8.1.0-alpha.6",
"version": "8.1.0-alpha.7",
"description": "Core Storybook Components",
"keywords": [
"storybook"
Expand Down

0 comments on commit cf2e5b9

Please sign in to comment.