dev
parent
d37d179993
commit
115047b300
@ -1,10 +1,6 @@
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"usingComponents": {}
|
||||
=======
|
||||
"usingComponents": {},
|
||||
"navigationBarTitleText": "添加事件",
|
||||
"navigationBarTextStyle":"black",
|
||||
"navigationBarBackgroundColor": "#ffffff"
|
||||
>>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103
|
||||
}
|
Loading…
Reference in new issue