解决冲突

liuyg

2021-06-19 66f2854366a59a2194ac51e67e5c6ddc29b20ff3

1
2
//>>built
define({redLabel:"r",greenLabel:"g",blueLabel:"b",hueLabel:"n",saturationLabel:"m",valueLabel:"k",degLabel:"\u00b0",hexLabel:"hex",huePickerTitle:"Nyans",saturationPickerTitle:"M\u00e4ttnad"});