merge conflict

end term homework
Merge pull request 'codeMark' (#1 ) from Luchun_Su into main
7 changed files with 16 additions and 1 deletions
--- a/#5小组_第一次实验报告.docx
+++ b/#5小组_第一次实验报告.docx
--- a/111.txt.txt
+++ b/111.txt.txt
--- 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
--- a/test_002.txt
+++ b/test_002.txt
@ -0,0 +1,6 @@
 .LOG
 this is a line of test input.
 20:03 2024-03-22
 22:21 2024-03-22
 a new line of input
--- a/小米便签阅读与维护-汇报_罗奕翔.pptx
+++ b/小米便签阅读与维护-汇报_罗奕翔.pptx
Author	SHA1	Message	Date
Jackalope_2023	b9b4ba18b1	merge conflict	9 months ago
Jackalope_2023	edaeaba431	end term homework	9 months ago
pxrnavcm8	25175170d8	Merge pull request 'codeMark' (#1 ) from Luchun_Su into main	11 months ago
Jackalope_2023	6527b6c04d	homework upload	11 months ago
苏鹿瑃	d3b71f76d9	111.txt	11 months ago
Jackalope_2023	b3d9b7b87d	verifing possibility	11 months ago
Jackalope_2023	879f8ad90b	modify made	11 months ago
舒振峰	fc1f8f0e32	text_002.txt	11 months ago
舒振峰	a068467278	altered one doc	11 months ago
舒振峰	d2ed77ee7a	shuzhenfeng	11 months ago
		`@ -0,0 +1,2 @@`
							`.LOG`
							`git clone using git Bash is simple and fast.`