Merge branch 'main' of https://bdgit.educoder.net/mgamqvkno/yuan-gittest into branch2

# Conflicts: # doc/doc-test.txt
4 months ago · 8231757f2d
parent cdbb05d928 6da697e7b3
commit 8231757f2d
1 changed files with 1 additions and 1 deletions
--- a/doc/doc-test.txt
+++ b/doc/doc-test.txt
@ -1,2 +1,2 @@
 this is a testing file in doc folder.
-this is another branch.
+this is another branch.in main branch