diff --git a/src/views/officialSeal/components/uploadSeal.vue b/src/views/officialSeal/components/uploadSeal.vue
index 53d1786..56e2c15 100644
--- a/src/views/officialSeal/components/uploadSeal.vue
+++ b/src/views/officialSeal/components/uploadSeal.vue
@@ -87,13 +87,8 @@ export default {
         },
         handleSuccess(response) {
             if (response.code == 200) {
-<<<<<<< HEAD
                 this.$message.success('上传成功');
                 this.cancel()
-=======
-                this.$message.success('上传成功')
-                this.$emit("cancelUpload");
->>>>>>> bc4691123ec628dfcb0e8da135f81da669366537
             } else {
                 this.$message.error(response.msg);
             }