forked from xuos/xiuos
solve the Conflicts # Conflicts: # APP_Framework/Framework/knowing/Kconfig |
||
|---|---|---|
| .. | ||
| app_test | ||
| connection_app | ||
| control_app | ||
| general_functions | ||
| knowing_app | ||
| ota | ||
| sensor_app | ||
| Kconfig | ||
| Makefile | ||
| SConscript | ||
| cppmain.cpp | ||
| framework_init.c | ||
| main.c | ||