forked from xuos/xiuos
solve the Conflicts # Conflicts: # APP_Framework/Framework/knowing/Kconfig |
||
|---|---|---|
| .. | ||
| connection | ||
| control | ||
| knowing | ||
| security | ||
| sensor | ||
| transform_layer | ||
| Kconfig | ||
| Makefile | ||
| SConscript | ||
solve the Conflicts # Conflicts: # APP_Framework/Framework/knowing/Kconfig |
||
|---|---|---|
| .. | ||
| connection | ||
| control | ||
| knowing | ||
| security | ||
| sensor | ||
| transform_layer | ||
| Kconfig | ||
| Makefile | ||
| SConscript | ||