feat(json-diff): resolve merge conflicts

This commit is contained in:
Carsten Götzinger 2023-04-14 14:09:11 +02:00
parent fb822f9634
commit dd3be277c3

1
components.d.ts vendored
View file

@ -50,7 +50,6 @@ declare module '@vue/runtime-core' {
NP: typeof import('naive-ui')['NP']
NPageHeader: typeof import('naive-ui')['NPageHeader']
NProgress: typeof import('naive-ui')['NProgress']
NResult: typeof import('naive-ui')['NResult']
NScrollbar: typeof import('naive-ui')['NScrollbar']
NSelect: typeof import('naive-ui')['NSelect']
NSlider: typeof import('naive-ui')['NSlider']