fix(merge): Fix merging CN Json#11574

me-no-dev merged 1 commit intoespressif:masterespressif/arduino-esp32:masterfrom

lucasssvaz:fix/cn_mergelucasssvaz/arduino-esp32:fix/cn_mergeCopy head branch name to clipboard