fixed merge fault

This commit is contained in:
wlyu
2022-01-30 23:39:16 +08:00
90 changed files with 15039 additions and 482 deletions
+1 -1
View File
@@ -13,7 +13,7 @@
/**
* @file dev_adc.h
* @brief define adc dev function using bus driver framework
* @version 1.1
* @version 1.1
* @author AIIT XUOS Lab
* @date 2021-12-28
*/