diff --git a/teamwork.txt b/teamwork.txt index 95be659..03d2e7e 100644 --- a/teamwork.txt +++ b/teamwork.txt @@ -1 +1 @@ -协作文件由 B 同学完成修改 +协作冲突内容:A 同学先提交