From c0c9335c4e404beb94890fe2ef402380b8e3b151 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期三, 13 三月 2024 19:57:35 +0800
Subject: [PATCH] fix(sad): 阿斯蒂芬

---
 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