解决冲突

liuyg

2021-06-19 66f2854366a59a2194ac51e67e5c6ddc29b20ff3

1
2
//>>built
define({doNew:"[ny]",edit:"[redig\u00e9r]",save:"[gem]",cancel:"[annull\u00e9r]"});