处理冲突
This commit is contained in:
@@ -19,6 +19,8 @@
|
||||
"views/menu_view.xml",
|
||||
"views/tool_base_views.xml",
|
||||
"views/tool_base_menu.xml",
|
||||
'views/fixture_base_view.xml',
|
||||
'views/menu_fixture_view.xml',
|
||||
|
||||
],
|
||||
'demo': [
|
||||
|
||||
Reference in New Issue
Block a user