fix(gui-v2): resolve merge issues

packages/nc-gui-v2/components.d.ts

@@ -47,6 +47,7 @@ declare module '@vue/runtime-core' {
     ARow: typeof import('ant-design-vue/es')['Row']
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
+    ASkeleton: typeof import('ant-design-vue/es')['Skeleton']
     ASkeletonImage: typeof import('ant-design-vue/es')['SkeletonImage']
     ASpin: typeof import('ant-design-vue/es')['Spin']
     ASubMenu: typeof import('ant-design-vue/es')['SubMenu']

packages/nc-gui-v2/components/smartsheet/sidebar/MenuBottom.vue

@@ -54,11 +54,7 @@ function onOpenModal(type: ViewTypes, title = '') {
 
           <div class="flex-1" />
 
-          <<<<<<< HEAD
           <mdi-plus class="group-hover:text-primary" />
-          =======
-          <MdiPlus class="group-hover:text-primary" />
-          >>>>>>> develop
         </div>
       </a-tooltip>
     </a-menu-item>
@@ -76,11 +72,7 @@ function onOpenModal(type: ViewTypes, title = '') {
 
           <div class="flex-1" />
 
-          <<<<<<< HEAD
           <mdi-plus class="group-hover:text-primary" />
-          =======
-          <MdiPlus class="group-hover:text-primary" />
-          >>>>>>> develop
         </div>
       </a-tooltip>
     </a-menu-item>
@@ -98,11 +90,7 @@ function onOpenModal(type: ViewTypes, title = '') {
 
           <div class="flex-1" />
 
-          <<<<<<< HEAD
           <mdi-plus class="group-hover:text-primary" />
-          =======
-          <MdiPlus class="group-hover:text-primary" />
-          >>>>>>> develop
         </div>
       </a-tooltip>
     </a-menu-item>
@@ -150,11 +138,7 @@ function onOpenModal(type: ViewTypes, title = '') {
           class="group flex items-center gap-2 w-full mx-3 px-4 py-2 rounded-l !bg-primary text-white transform translate-x-4 hover:(translate-x-0 shadow-lg !opacity-100) transition duration-150 ease"
           @click.stop
         >
-          <<<<<<< HEAD
           <mdi-cards-heart class="text-red-500" />
-          =======
-          <MdiCardsHeart class="text-red-500" />
-          >>>>>>> develop
           {{ $t('activity.sponsorUs') }}
         </a>
       </template>

packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue

@@ -129,17 +129,7 @@ function openQuickImportDialog(type: string) {
         </a-tabs>
       </div>
 
-      <<<<<<< HEAD
-      <div class="flex-1 min-h-0">
-        <NuxtPage />
-      </div>
-
-      <DlgTableCreate v-if="tableCreateDialog" v-model="tableCreateDialog" />
-      <DlgQuickImport v-if="quickImportDialog" v-model="quickImportDialog" :import-type="importType" :import-only="false" />
-      <DlgAirtableImport v-if="airtableImportDialog" v-model="airtableImportDialog" />
-      =======
       <NuxtPage class="px-4 pt-2" />
-      >>>>>>> develop
     </div>
 
     <DlgTableCreate v-if="tableCreateDialog" v-model="tableCreateDialog" />