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

fix: conflict errors

This commit is contained in:
Acid Chicken (硫酸鶏) 2023-04-01 13:58:35 +09:00
parent c6d12c21db
commit d300f4a87b
No known key found for this signature in database
GPG Key ID: 3E87B98A3F6BAB99
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/MkContextMenu.vue
View File

@ -19,7 +19,6 @@ import { MenuItem } from './types/menu.vue';
import contains from '@/scripts/contains'; import contains from '@/scripts/contains';
import { defaultStore } from '@/store'; import { defaultStore } from '@/store';
import * as os from '@/os'; import * as os from '@/os';
import { defaultStore } from '@/store';
const props = defineProps<{ const props = defineProps<{
items: MenuItem[]; items: MenuItem[];