解决冲突

liuyg

2021-06-02 029883129b3014a8cbd694fe09409bf4379c2cc2

1
2
//>>built
define(["../SimpleTheme","./common"],function(b,a){a.Desert=new b({colors:["#ffebd5","#806544","#fdc888","#80766b","#cda26e"]});return a.Desert});