+ Fixed issue in autoCode/index.vue file that make building fail.

2024-12-23 13:13:52 +02:00 · 2024-12-23 13:13:52 +02:00 · cad98da84c
parent 0f1407ebfe
commit cad98da84c
1 changed files with 0 additions and 4 deletions
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@ -853,13 +853,9 @@
        </el-button>
        <el-upload
          :before-upload="importJson"
-<<<<<<< HEAD
-=======
          :show-file-list="false"
->>>>>>> main
          accept=".json"
          class="flex items-center"
-          show-file-list="false"
        >
          <el-button class="mx-2" type="primary" :disabled="isAdd">{{
            t('view.systemTools.autoCode.importJson')