fix conflict

Helius

2020-12-11 37b2fa02d4e9540b67f9ec02740d7720ec38df3a

1
2
3
4
5
6
{
  "navigationBarTitleText":"个人中心",
  "navigationBarBackgroundColor": "#00C085",
  "backgroundTextStyle": "light",
  "navigationBarTextStyle":"white"
}