merge conflict

end term homework
verifing possibility
4 changed files with 10 additions and 1 deletions
--- a/feature.mp4
+++ b/feature.mp4
--- a/newDoc.txt
+++ b/newDoc.txt
@ -0,0 +1,2 @@
+.LOG
+git clone using git Bash is simple and fast.
--- a/test_001.txt
+++ b/test_001.txt
@ -1,5 +1,12 @@
 .LOG
 this is a file for test.
 this is a line of input.
+
+13:28 2024/3/23
+type for test use
+14:00 2024/3/23
+type for verify use
+
 19:31 2024-03-23
-test for verify use
+test for verify use
+
--- a/小米便签阅读与维护-汇报_罗奕翔.pptx
+++ b/小米便签阅读与维护-汇报_罗奕翔.pptx
Author	SHA1	Message	Date
Jackalope_2023	b9b4ba18b1	merge conflict	6 months ago
Jackalope_2023	edaeaba431	end term homework	6 months ago
Jackalope_2023	b3d9b7b87d	verifing possibility	8 months ago
Jackalope_2023	879f8ad90b	modify made	8 months ago