forked from xuos/xiuos
solve the Conflicts # Conflicts: # APP_Framework/Framework/knowing/Kconfig |
||
|---|---|---|
| .. | ||
| Applications | ||
| Framework | ||
| lib | ||
| Kconfig | ||
| Makefile | ||
solve the Conflicts # Conflicts: # APP_Framework/Framework/knowing/Kconfig |
||
|---|---|---|
| .. | ||
| Applications | ||
| Framework | ||
| lib | ||
| Kconfig | ||
| Makefile | ||