forked from xuos/xiuos
solve the Conflicts # Conflicts: # APP_Framework/Framework/knowing/Kconfig |
||
|---|---|---|
| .. | ||
| cmsis_5 | ||
| filter | ||
| image_processing | ||
| kpu | ||
| ota | ||
| tensorflow-lite | ||
| Kconfig | ||
| Makefile | ||
| SConscript | ||
solve the Conflicts # Conflicts: # APP_Framework/Framework/knowing/Kconfig |
||
|---|---|---|
| .. | ||
| cmsis_5 | ||
| filter | ||
| image_processing | ||
| kpu | ||
| ota | ||
| tensorflow-lite | ||
| Kconfig | ||
| Makefile | ||
| SConscript | ||