From d300f4a87b52abc3bcdbdd316b1efdb479b9856d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Sat, 1 Apr 2023 13:58:35 +0900 Subject: [PATCH] fix: conflict errors --- packages/frontend/src/components/MkContextMenu.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend/src/components/MkContextMenu.vue b/packages/frontend/src/components/MkContextMenu.vue index ded7af10f..b81c806b0 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[];