From b390b9bc7103f2c7bd36c2ac0b45f0e457eb732e Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Sat, 27 Jun 2020 19:22:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app.json b/app.json
index 9dfcf50..64d7f6e 100644
--- a/app.json
+++ b/app.json
@@ -1,12 +1,8 @@
 {
   "pages": [
-<<<<<<< Updated upstream
-    "pages/center/center",
-    "pages/book/book",
-=======
-    "pages/broadcastList/broadcastList",
->>>>>>> Stashed changes
     "pages/index/index",
+    "pages/center/center",
+    "pages/broadcastList/broadcastList",
     "pages/orderDetail/orderDetail",
     "pages/myVenueOrder/myVenueOrder",
     "pages/book/book",