解决冲突

liuyg

2021-06-02 029883129b3014a8cbd694fe09409bf4379c2cc2

1
2
//>>built
define({buttonOk:"OK",buttonCancel:"Annull\u00e9r",buttonSave:"Gem",itemClose:"Luk"});