feat(json-diff): resolve merge conflicts
This commit is contained in:
parent
fb822f9634
commit
dd3be277c3
1
components.d.ts
vendored
1
components.d.ts
vendored
@ -50,7 +50,6 @@ declare module '@vue/runtime-core' {
|
|||||||
NP: typeof import('naive-ui')['NP']
|
NP: typeof import('naive-ui')['NP']
|
||||||
NPageHeader: typeof import('naive-ui')['NPageHeader']
|
NPageHeader: typeof import('naive-ui')['NPageHeader']
|
||||||
NProgress: typeof import('naive-ui')['NProgress']
|
NProgress: typeof import('naive-ui')['NProgress']
|
||||||
NResult: typeof import('naive-ui')['NResult']
|
|
||||||
NScrollbar: typeof import('naive-ui')['NScrollbar']
|
NScrollbar: typeof import('naive-ui')['NScrollbar']
|
||||||
NSelect: typeof import('naive-ui')['NSelect']
|
NSelect: typeof import('naive-ui')['NSelect']
|
||||||
NSlider: typeof import('naive-ui')['NSlider']
|
NSlider: typeof import('naive-ui')['NSlider']
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user