From 3e5aa77ff5d6401f15934b53025cd6ac1bc26258 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Sat, 24 Sep 2022 22:14:02 +0200 Subject: [PATCH] rebase --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index fa28a3c3..6c7c1d4f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,9 @@ [submodule "code/components/esp32-camera-master"] path = code/components/esp32-camera-master url = https://github.com/espressif/esp32-camera.git -<<<<<<< HEAD -======= [submodule "code/components/esp-nn"] path = code/components/esp-nn url = https://github.com/espressif/esp-nn.git [submodule "code/components/tflite-micro-esp-examples"] path = code/components/tflite-micro-esp-examples url = https://github.com/espressif/tflite-micro-esp-examples.git ->>>>>>> added tflite-lib (resp. tflite-micro-esp-examples) again as submodule (master)