Merge branch '0309' of https://gitlink.org.cn/wlyu/xiuos into 0309

2022-03-17 18:33:11 +08:00
parent be61178e44 e5d124231c
commit c61c6dafea
2 changed files with 7 additions and 0 deletions
@@ -71,7 +71,10 @@ int MountSDCard(void)
 #endif
 #ifdef BSP_USING_LPUART
 #include <connect_uart.h>
+<<<<<<< HEAD
 #endif
+=======
+>>>>>>> e5d124231c72798f7f77b842cc8c631b79043914

 #ifdef BSP_USING_ADC
 #include <connect_adc.h>