From 3dd529c741a5a4feffb07bd9e649fba0a880c6e0 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 10 Dec 2021 15:23:43 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/regionalParty/activitys.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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>