mirror of
https://github.com/DragonOS-Community/DragonOS.git
synced 2025-06-22 07:03:22 +00:00
merge master and fix conflicts
This commit is contained in:
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
@ -121,7 +121,8 @@
|
||||
"textui.h": "c",
|
||||
"atomic.h": "c",
|
||||
"uart.h": "c",
|
||||
"fat_ent.h": "c"
|
||||
"fat_ent.h": "c",
|
||||
"semaphore.h": "c"
|
||||
},
|
||||
"C_Cpp.errorSquiggles": "Enabled",
|
||||
"esbonio.sphinx.confDir": ""
|
||||
|
Reference in New Issue
Block a user