usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: conflict error

This commit is contained in:
Acid Chicken (硫酸鶏) 2023-04-13 08:40:07 +00:00 committed by GitHub
parent 5199e13cb2
commit 357ae00045
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/frontend/src/components/MkAnalogClock.stories.impl.ts
View File

@ -2,7 +2,6 @@
import { StoryObj } from '@storybook/vue3'; import { StoryObj } from '@storybook/vue3';
import isChromatic from 'chromatic/isChromatic'; import isChromatic from 'chromatic/isChromatic';
import MkAnalogClock from './MkAnalogClock.vue'; import MkAnalogClock from './MkAnalogClock.vue';
import isChromatic from 'chromatic';
export const Default = { export const Default = {
render(args) { render(args) {
return { return {