解决冲突

liuyg

2021-06-19 66f2854366a59a2194ac51e67e5c6ddc29b20ff3

1
2
//>>built
define({redLabel:"g",greenLabel:"b",blueLabel:"u",hueLabel:"t",saturationLabel:"a",valueLabel:"i",degLabel:"\u00b0",hexLabel:"hex",huePickerTitle:"Tonuen hautatzailea",saturationPickerTitle:"Asetasunaren hautatzailea"});