解决冲突 更新代码
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
#menu and button info
|
#menu and button info
|
||||||
funMenu=function menu
|
funMenu=function menu
|
||||||
sysManage=system management
|
sysManage=system management
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
#menu and button info
|
#menu and button info
|
||||||
funMenu=function menu
|
funMenu=function menu
|
||||||
sysManage=system management
|
sysManage=system management
|
||||||
|
|||||||
Reference in New Issue
Block a user