Merge conflict resolved

makermelissa · makermelissa · commit 5eb18d3a7a4b · 2023-09-01T14:35:14.000-07:00
diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -64,6 +64,7 @@
     "0x239A:0x102E": ["weact_studio_pico", "weact_studio_pico_16mb"],
     "0x303A:0x8166": ["yd_esp32_s3_n8r8", "yd_esp32_s3_n16r8"],
     "0x2341:0x056B": ["arduino_nano_esp32s3", "arduino_nano_esp32s3_inverted_statusled"],
+    "0x2E8A:0x1020": ["waveshare_rp2040_plus_4mb", "waveshare_rp2040_plus_16mb"],
 }
 
 cli_parser = argparse.ArgumentParser(

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@`
`64`	`64`	`"0x239A:0x102E": ["weact_studio_pico", "weact_studio_pico_16mb"],`
`65`	`65`	`"0x303A:0x8166": ["yd_esp32_s3_n8r8", "yd_esp32_s3_n16r8"],`
`66`	`66`	`"0x2341:0x056B": ["arduino_nano_esp32s3", "arduino_nano_esp32s3_inverted_statusled"],`
	`67`	`+ "0x2E8A:0x1020": ["waveshare_rp2040_plus_4mb", "waveshare_rp2040_plus_16mb"],`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`cli_parser = argparse.ArgumentParser(`