Merge branch 'f_branch' of https://bdgit.educoder.net/pzb5nr4ph/Wuchunxiang_Git_P2 into e_branch

# Conflicts: # src/c.c
2 years ago · 949bce7fc5
parent 5d9282c02b bf450f67ac
commit 949bce7fc5
1 changed files with 1 additions and 0 deletions
--- a/src/c.c
+++ b/src/c.c
@ -1,2 +1,3 @@
 include
+#define
 main