diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2023-04-01 13:58:35 +0900 |
|---|---|---|
| committer | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2023-04-01 13:58:35 +0900 |
| commit | d300f4a87b52abc3bcdbdd316b1efdb479b9856d (patch) | |
| tree | 74113be61a0b93690b07b8ac6318644e0c97e760 | |
| parent | build(#10336): write stories for `MkMisskeyFlavoredMarkdown` (diff) | |
| download | misskey-d300f4a87b52abc3bcdbdd316b1efdb479b9856d.tar.gz misskey-d300f4a87b52abc3bcdbdd316b1efdb479b9856d.tar.bz2 misskey-d300f4a87b52abc3bcdbdd316b1efdb479b9856d.zip | |
fix: conflict errors
| -rw-r--r-- | packages/frontend/src/components/MkContextMenu.vue | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkContextMenu.vue b/packages/frontend/src/components/MkContextMenu.vue index ded7af10f1..b81c806b0c 100644 --- a/packages/frontend/src/components/MkContextMenu.vue +++ b/packages/frontend/src/components/MkContextMenu.vue @@ -19,7 +19,6 @@ import { MenuItem } from './types/menu.vue'; import contains from '@/scripts/contains'; import { defaultStore } from '@/store'; import * as os from '@/os'; -import { defaultStore } from '@/store'; const props = defineProps<{ items: MenuItem[]; |