typo

ituring · Sep 14, 2022 · a4e624b · a4e624b
1 parent e5b565a
commit a4e624b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -76,14 +76,11 @@ <h3>读者来稿</h3>
 <select class="select"></select>
 
 <section class="wrap">
-<<<<<<< HEAD
 <p class="impression" style="color:blue">2022/9/14 By liubin part 1 </p>
 <p class="impression" style="color:blue">2022/9/14 By liubin part 2 </p>
 <p class="impression" style="color:blue">2022/9/13 From sysu </p>
 <p class="impression" style="color:red">2022/8/8 大家好，这是用于测试开展基于pull request的代码审查软件测试实验，非常感谢作者。 </p>
-=======
 <p class="impression" style="color: #8A2BE2;">书很好，放到现在也还是很有参考价值！(@Clov614) 2022/4/18</p>
->>>>>>> 1f7b2db (Add my impression)
 <p class="impression"><mark>小陈同学来测试啦啦</mark></p>
 <p class="impression" style="color:blue"> 第一个PR!!!Thanks!!! (@XxxuLimei) 2021/12/19 9:57 </p>
 <p class="impression" style="color:#FF7F00FF"> PR成功!(@Algo) 2021.10.25 </p>