From 3acc1cd9e43e2143f25a874eebbd875584a5e278 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Fri, 26 Jun 2020 15:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/center.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pages/center/center.js b/pages/center/center.js
index 9d572b2..9fca8ff 100644
--- a/pages/center/center.js
+++ b/pages/center/center.js
@@ -62,8 +62,6 @@ Page({
       },
     })
   },
-<<<<<<< HEAD
-=======
   /**
    * 跳转到我的志愿团队页面
    */
@@ -81,7 +79,6 @@ Page({
     })
   },
 
->>>>>>> 8efd16995df21586c7ff79678f34b0547afeb3e4
   /**
    * 生命周期函数--监听页面加载
    */