解决冲突

liuyg

2021-06-17 3c3d6b18872b4a56e1e6b3682f6ceb5b1b4069a2

1
2
//>>built
define({buttonOk:"OK",buttonCancel:"M\u00e9gse",buttonSave:"Ment\u00e9s",itemClose:"Bez\u00e1r\u00e1s"});