diff --git a/README.md b/README.md index 633c311c29f2d4218a0f218635668e85285089e3..1d55f153d73faa2df44e2f9ed77ef6518b952740 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ ## 目前已布置的实验 * [lab1](./Documentations/1-parser/) -<<<<<<< HEAD + DDL:2022-10-03 23:59:59 (UTC+8) - [report](./Reports/1-parser/) @@ -28,22 +27,13 @@ + DDL: 2022-12-12 23:59:59 (UTC+8) - [report](./Reports/4.2-gvn/report.md) -======= - + DDL:2021-10-06(~~10-03~~) 23:59:59 (UTC+8) -* [lab2](./Documentations/2-ir-gen-warmup/) - + DDL:2021-10-22 23:59:59 (UTC+8) -* [lab3](./Documentations/3-ir-gen/) - + DDL: 2021-11-21 23:59:59 (UTC+8) -* [lab4](./Documentations/4-ir-opt) - + DDL: - + **阶段一**:2021/11/29 23:59:59 (UTC+8) - + **阶段二**:2022/12/13 23:59:59 (UTC+8) * [lab5](./Documentations/5-bonus/) - + DDL: - + **建议报名期限**:2023/01/29 - + **实验提交**:2023 年 3 月初,具体时间待定 - + **答辩时间**:2023 年 3 月初,具体时间待定 ->>>>>>> 258a73911f85493b8766ab5470b0db50e19580e3 + + + DDL: + + **建议报名期限**:2023/01/29 + + **实验提交**:2023 年 3 月初,具体时间待定 + + **答辩时间**:2023 年 3 月初,具体时间待定 + ## FAQ: How to merge upstream remote branches In brief, you need another alias for upstream repository (we assume you are now in your local copy of forked repository on Gitlab):