Merge branch 'main' of https://bdgit.educoder.net/p3eyswgkl/ReadMiNotes

# Conflicts: # sample.txt
1 year ago · 9d923e6063
parent a40d149942 64c0909da2
commit 9d923e6063
1 changed files with 4 additions and 0 deletions
--- a/sample.txt
+++ b/sample.txt
@ -1,4 +1,8 @@
+<<<<<<< HEAD
 30
 2
 6 10
 18 20
+=======
+组员：王崇宇、孙永霖、李东阳
+>>>>>>> 64c0909da2ce9acc81ff108d1cb4199dc8b159a6