fix conflict

Helius

2020-12-11 37b2fa02d4e9540b67f9ec02740d7720ec38df3a

1
2
3
4
5
6
7
{
  
  
  "navigationBarTitleText": "所有拼团",
  "backgroundColor": "#eeeeee",
  "backgroundTextStyle": "light"
}