docs: Resolve conflict

Browse Source

...

This commit is contained in:

Zhang Shuxian

2024-06-25 15:22:09 +08:00

parent b5762b732b

commit aee423348a

8 changed files with 2 additions and 628 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

docs/_static/esp32-s2-devkitc-1-v1-annotated-photo.png

Vendored

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 420 KiB

docs/_static/esp32-s2-devkitc-1-v1-block-diags.png

Vendored

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 72 KiB

docs/_static/esp32-s2-devkitc-1-v1-isometric.png

Vendored

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 291 KiB

docs/_static/esp32-s2-devkitc-1-v1-pinout.png

Vendored

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 494 KiB