From 35dcdffd45d15ad174015811c63fca8a5b253dd4 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 12 三月 2024 14:59:44 +0800
Subject: [PATCH] app.json

---
 app.json |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/app.json b/app.json
index ededab2..188d4a6 100644
--- a/app.json
+++ b/app.json
@@ -1,13 +1,9 @@
 {
   "pages": [
-<<<<<<< HEAD
     "pages/home/home",
-    "pages/resourceDetails/index",
-=======
     "pages/resourceDetails/myAudio/index",
     "pages/resourceDetails/myVideo/index",
     "pages/resourceDetails/document/index",
->>>>>>> master
     "pages/retrievalPage/index",
     "pages/cart/paymentPage/index",
     "pages/cart/index",

--
Gitblit v1.9.1