After merge fixes

This commit is contained in:
igor 2018-01-08 18:15:53 +02:00
parent 2aac9933fd
commit 11687bdc09
3 changed files with 2 additions and 3 deletions

View File

@ -1,5 +1,4 @@
import { Type, NgModule, Component } from '@angular/core';
import { AppComponent } from './app.component';
import { STORY } from './app.token';
import { getAnnotations, getParameters, getPropMetadata } from './utils';

View File

@ -33,7 +33,7 @@
"@storybook/addon-actions": "^3.4.0-alpha.0",
"@storybook/addon-links": "^3.4.0-alpha.0",
"@storybook/addon-notes": "^3.4.0-alpha.0",
"@storybook/addon-storyshots": "^3.4.0-alpha.0",
"@storybook/addon-storyshots": "^3.4.0-alpha.0",
"@storybook/addons": "^3.4.0-alpha.0",
"@storybook/angular": "^3.4.0-alpha.0",
"@types/jasmine": "~2.8.3",

View File

@ -8,7 +8,7 @@
"@storybook/addon-knobs": "^3.4.0-alpha.0",
"@storybook/addon-links": "^3.4.0-alpha.0",
"@storybook/addon-notes": "^3.4.0-alpha.0",
"@storybook/addon-storyshots": "^3.4.0-alpha.0",
"@storybook/addon-storyshots": "^3.4.0-alpha.0",
"@storybook/addon-viewport": "^3.4.0-alpha.0",
"@storybook/addons": "^3.4.0-alpha.0",
"@storybook/vue": "^3.4.0-alpha.0",