forked from xuos/xiuos
17be211288
solve the Conflicts # Conflicts: # APP_Framework/Framework/knowing/Kconfig
solve the Conflicts # Conflicts: # APP_Framework/Framework/knowing/Kconfig