Merge branch 'dev'

# Conflicts: # hello.c
加了个注释
2025-08-15 14:09:52 +08:00 · 2025-08-15 13:46:10 +08:00 · 2025-08-15 13:36:15 +08:00
1 changed files with 1 additions and 2 deletions
--- a/hello.c
+++ b/hello.c
@ -2,8 +2,7 @@
 #define __HELLO_C__
-
+#define HELLO  (11u) // 123
 #define HELLO  (22u)
 #endif
Author	SHA1	Message	Date
xqq27	03743e2d0c	Merge branch 'dev' # Conflicts: # hello.c	2025-08-15 14:09:52 +08:00
xqq27	834c81fedf	加了个注释	2025-08-15 13:46:10 +08:00
xqq27	00568df40c	改为11	2025-08-15 13:36:15 +08:00