From dd3be277c3b7b26be1643a6ce9f89797e33130f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20G=C3=B6tzinger?= <carsten.goetzinger@concedro.com>
Date: Fri, 14 Apr 2023 14:09:11 +0200
Subject: [PATCH] feat(json-diff): resolve merge conflicts

---
 components.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components.d.ts b/components.d.ts
index 8c75790d..47aa09c7 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -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']