Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes

# Conflicts: # src/1.txt
2 years ago · 161a1373ee
parent ccd92c6319 df7aa40146
commit 161a1373ee
3 changed files with 2 additions and 2 deletions
--- a/doc/1.txt
+++ b/doc/1.txt
@ -0,0 +1 @@
+1
--- a/doc/2.txt
+++ b/doc/2.txt
@ -1 +0,0 @@
-123
--- a/src/1.txt
+++ b/src/1.txt
@ -1 +1 @@
-Ôø³¿êØ_branch
+1