From 416c3fd9b8875c5b54be66d23e6875102ce0cfa8 Mon Sep 17 00:00:00 2001
From: LiXiaoQi <lxq877250099@mail.ustc.edu.cn>
Date: Fri, 18 Nov 2022 10:19:50 +0800
Subject: [PATCH] deal with merge conflict

---
 README.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 712da69..ab5e0d9 100644
--- a/README.md
+++ b/README.md
@@ -13,16 +13,11 @@
     - [report](./Reports/2-ir-gen-warmup/report.md)    
 
 * [lab3](./Documentations/3-ir-gen/)
-<<<<<<< HEAD
-  
-    + DDL：2022-11-07 23:59:59 (UTC+8)
-    - [report](./Reports/3-ir-gen/report.md)  
-=======
   + DDL：2022-11-13 23:59:59 (UTC+8)
+  - [report](./Reports/3-ir-gen/report.md)  
 
 * [lab4.1](./Documentations/4.1-ssa/)
   + DDL：2022-11-27 23:59:59 (UTC+8)
->>>>>>> 2f5d0fa70297542b1032ca4614f0f426fa7a4e33
 
 ## FAQ: How to merge upstream remote branches
 
-- 
GitLab