冲突处理

495d01f6 · 潘永坪 · ebb83e54 · 495d01f6
Commit 495d01f6 authored Aug 15, 2024 by 潘永坪
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

pages.json pages.json +4 -5

No files found.
--- a/pages.json
+++ b/pages.json
@@ -265,12 +265,12 @@

 				},
 				{
-<<<<<<< HEAD
 					"path" : "addressManage/addressManage",
-					"style" : 
-					{
+					"style" : {
 						"navigationBarTitleText" : "地址管理"
-=======
+					}
+				},
+				{
 					"path" : "order/jointElectronicTicket/jointElectronicTicket",
 					"style" : 
 					{
@@ -278,7 +278,6 @@
 						"enablePullDownRefresh": false,
 						"navigationBarTextStyle": "black",
 						"navigationBarBackgroundColor": "#F7F8FA"
->>>>>>> develop
 					}
 				}
 			]