Skip to content

U
uni-pdtravel
Commit 495d01f6 authored by 潘永坪's avatar 潘永坪
Browse files
Options

冲突处理

parent ebb83e54
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
pages.json
View file @ 495d01f6
...@@ -265,12 +265,12 @@ ...@@ -265,12 +265,12 @@
}, },
{ {
<<<<<<< HEAD
"path" : "addressManage/addressManage", "path" : "addressManage/addressManage",
"style" : "style" : {
{
"navigationBarTitleText" : "地址管理" "navigationBarTitleText" : "地址管理"
======= }
},
{
"path" : "order/jointElectronicTicket/jointElectronicTicket", "path" : "order/jointElectronicTicket/jointElectronicTicket",
"style" : "style" :
{ {
...@@ -278,7 +278,6 @@ ...@@ -278,7 +278,6 @@
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#F7F8FA" "navigationBarBackgroundColor": "#F7F8FA"
>>>>>>> develop
} }
} }
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment