Merge branch 'b_branch' of https://bdgit.educoder.net/pzb5nr4ph/Wuchunxiang_Git_P2 into c_branch

# Conflicts: # src/c.c
2 years ago · e480fa1aa7
parent 03c10c3212 2995c61b6d
commit e480fa1aa7
1 changed files with 4 additions and 1 deletions
--- a/src/c.c
+++ b/src/c.c
@ -1,2 +1,5 @@
 main
-printf
+printf
 main
 {
 }
 main
 printf
+main
+{
+}