fixed rebase conflicts

This commit is contained in:
CaCO3
2022-09-24 22:32:01 +02:00
parent 8a6bd97ec2
commit fc4f3eebb6
96 changed files with 5 additions and 48410 deletions

4
.gitmodules vendored
View File

@@ -1,5 +1,5 @@
[submodule "code/components/esp32-camera-master"]
path = code/components/esp32-camera-master
[submodule "code/components/esp32-camera"]
path = code/components/esp32-camera
url = https://github.com/espressif/esp32-camera.git
[submodule "code/components/esp-nn"]
path = code/components/esp-nn