diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index 2b4ea8e..e0fb5f0 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -151,16 +151,7 @@
           /></el-select>
         </el-form-item>
         <el-form-item v-if="uploadForm.type == '3'" label="蓝图" prop="fileIds">
-<<<<<<< HEAD
-          <file-upload
-            :fileType="['pdf']"
-            :isShowTip="false"
-            :fileSize="100"
- .           v-model="uploadForm.fileIds"
-          ></file-upload>
-=======
           <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.fileIds"></file-upload>
->>>>>>> 8a3f338e2734575bcb743e917b1232bedc76f105
         </el-form-item>
         <el-form-item v-if="uploadForm.type == '3'" label="抄送人">
           <el-select multiple filterable clearable v-model="form.userIds" placeholder="请选择抄送人">