little big in README

Yuhan-xue · Jun 3, 2023 · a24fa73 · a24fa73
1 parent 8a4b7ec
commit a24fa73
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -21,8 +21,5 @@
 
 ## 作业三 [长期水位资料的调和分析](https://nbviewer.org/github/Yuhan-xue/HAN_Marine_element/blob/main/WORK3/WORK3.ipynb)
 
-<<<<<<< HEAD
-## 作业四 [地转流计算](https://nbviewer.org/github/Yuhan-xue/HAN_Marine_element/blob/main/WORK3/WORK4.ipynb)
-=======
-## 作业四 [地转流计算-施工ing](https://nbviewer.org/github/Yuhan-xue/HAN_Marine_element/blob/main/WORK4/WORK4.ipynb)
->>>>>>> 680f11fdec07efd2799c88d1aba5e62c7d378d49
+## 作业四 [地转流计算](https://nbviewer.org/github/Yuhan-xue/HAN_Marine_element/blob/main/WORK4/WORK4.ipynb)
+