解决冲突

liuyg

2021-06-19 66f2854366a59a2194ac51e67e5c6ddc29b20ff3

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