revert conflict
This commit is contained in:
parent
84dc436d83
commit
d6a23b3b6a
|
@ -1757,7 +1757,6 @@ new Promise(resolve=>{
|
|||
},
|
||||
splash_style:{
|
||||
name:'启动页',
|
||||
init:'style1',
|
||||
item:{
|
||||
style1:'样式一',
|
||||
style2:'样式二',
|
||||
|
|
Loading…
Reference in New Issue