diff --git a/src/components/Delivery/yihandeled.vue b/src/components/Delivery/yihandeled.vue
index c9a4e7c..f655bdb 100644
--- a/src/components/Delivery/yihandeled.vue
+++ b/src/components/Delivery/yihandeled.vue
@@ -37,16 +37,12 @@
             class="thebtn1"
             @click="handleExport"
           >{{ '导出' }}</el-button>
-          <<<<<<< Updated upstream
-          =======
           <el-button
             v-hasButtons="['DeliveryHandledExport']"
             size="small"
             class="thebtn1"
             @click="handleWaresExport"
           >仓储导出</el-button>
-
-          >>>>>>> Stashed changes
         </div>
       </div>
       <el-table