Fix merge conflict

This commit is contained in:
Melissa LeBlanc-Williams 2024-03-25 14:19:02 -07:00
parent b0d73729fe
commit 7549a55530

View file

@ -7,11 +7,7 @@ manufacturer: "Espressif"
board_url:
- "https://www.adafruit.com/product/5511"
board_image: "espressif_esp32s3_box_lite.jpg"
<<<<<<< HEAD
date_added: 2022-7-08
=======
date_added: 2022-07-08
>>>>>>> 3d693274c3dcb32e2dfaf508f90b599667e5e843
family: esp32s3
features:
- Wi-Fi