From a79f7d80e55319ae1a40954f6a4ce6e382cc1649 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 28 八月 2023 15:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
minipro_standard/pages.json | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 5c6f7ad..90a1b84 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -74,11 +74,6 @@
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#ffffff"
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 9e4d7b06a15aabe0141a991fe9358802a0590378
},
"tabBar": {
"color": "#666666",
--
Gitblit v1.9.3