GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-05 08:01:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX merge conflict

Browse Source
This commit is contained in:
Norbert de Langen 2019-03-14 09:28:57 +01:00
parent 7fb28ecc5e
commit 7e12272a12
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/api/src/modules/shortcuts.ts
View File

@ -1,14 +1,10 @@
import { navigator, document } from 'global';
import { PREVIEW_KEYDOWN } from '@storybook/core-events';
<<<<<<< HEAD:lib/api/src/modules/shortcuts.ts
import { Module, API } from '../index';
import { shortcutMatchesShortcut, eventToShortcut } from '../lib/shortcut';
=======
import { shortcutMatchesShortcut, eventToShortcut } from '../libs/shortcut';
import { focusableUIElements } from './layout';
>>>>>>> next:lib/ui/src/core/shortcuts.js
export const isMacLike = () =>
navigator && navigator.platform ? !!navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i) : false;

2
lib/api/src/version.ts
View File

@ -1 +1 @@
export const version = '5.1.0-alpha.5';
export const version = '5.1.0-alpha.6';