diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index dd7c5389..1638a07c 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -99,11 +99,8 @@
                      size="small"
                      type="red">导入</el-button>
 
-<<<<<<< HEAD
-        </el-upload>
-=======
+
         </el-upload> -->
-        >>>>>>> dev-shuju
 
       </div>