手动处理文件合并

2 years ago · b067fc9f6e
parent c64b3d34a9 1747ef5728
commit b067fc9f6e
1 changed files with 2 additions and 0 deletions
--- a/pull.txt
+++ b/pull.txt
@ -1,2 +1,4 @@
 3211.
 在main中修改文件
+在mipanpan分支下添加的内容
+