修改冲突

f6e1c301 · hu · 7728ec5d · f6e1c301
Commit f6e1c301 authored Jan 28, 2023 by hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

Key_user.c source/Application/APP/Key/Key_user.c +0 -3

No files found.
--- a/source/Application/APP/Key/Key_user.c
+++ b/source/Application/APP/Key/Key_user.c
@@ -14,11 +14,8 @@
 #include "kwp2000_service.h"
 #include "CAN_Communication_Matrix.h"

-<<<<<<< HEAD
 #include "UDS_Common.h"
-=======
 #include "SEG_DISPLAY.h"
->>>>>>> development

 /*----------按键具体功能执行的回调函数-----------------------*/
 #pragma ghs section bss=".myNonInitArea"