From 2f1a9a39d6bde43d8c73236f822b3bc79cc96af6 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 06 九月 2024 16:19:57 +0800
Subject: [PATCH] 联系我们修改

---
 app.json |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app.json b/app.json
index 0ab99af..957797f 100644
--- a/app.json
+++ b/app.json
@@ -77,13 +77,10 @@
         "pages/bookServices/webpage/index",
         "pages/components/webView/index",
         "pages/bookServices/detail/buyResource/index",
-<<<<<<< Updated upstream
-        "pages/bookServices/detail/components/learnTask/index"
-=======
+        "pages/bookServices/detail/components/learnTask/index",
         "pages/bookServices/linkPage/index"
->>>>>>> Stashed changes
       ]
-    }
+    } 
   ],
   "tabBar": {
     "custom": true,

--
Gitblit v1.9.1