From 12549720868c744d8ced6bf9f8e98a1b3065829e Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 5 Jun 2020 10:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app.json b/app.json
index 9acb075..cda5787 100644
--- a/app.json
+++ b/app.json
@@ -61,14 +61,11 @@
       "name": "associationNew",
       "pages": [
         "pages/associationlist/associationlist",
-<<<<<<< HEAD
         "pages/community/community",
         "pages/gMembersList/gMembersList",
-        "pages/gOfficialsList/gOfficialsList"
-=======
+        "pages/gOfficialsList/gOfficialsList",
         "pages/talklist/talklist",
         "pages/eventlist/eventlist"
->>>>>>> 8cb094475e355feb09b2c52a944da0015316e0df
       ]
     },
     {