fix conflict

Helius

2020-12-11 37b2fa02d4e9540b67f9ec02740d7720ec38df3a

1
2
3
4
5
6
7
#词汇表，保存系统的名词或者其他特有词汇
 
4000_0000=Function
4000_0001=Button
4000_0002=Compay
4000_0003=Admin
4000_0004=Role