任务10

Merge pull request '21371413我要合并' (#18 ) from buaa21371413/mylab:Feature-21371413 into dev
23
6 changed files with 13 additions and 1 deletions
--- a/Function-21371192.py
+++ b/Function-21371192.py
@ -0,0 +1,2 @@
 print('My Student_ID is 21371192')
 print('My Name is 王晰')
--- a/Function-21371193.py
+++ b/Function-21371193.py
@ -0,0 +1,2 @@
 print('My Student_ID is 21371193')
 print('My Name is 张文津')
--- a/Function-21371413.py
+++ b/Function-21371413.py
@ -0,0 +1,2 @@
 print('My Student_ID is 21371413')
 print('My Name is 尤世博')
--- a/Function-21371427.py
+++ b/Function-21371427.py
@ -1 +1,2 @@
 print('My Student_ID is 21371427')
 print('My Name is luochuan')
--- a/Function-21371434.py
+++ b/Function-21371434.py
@ -0,0 +1,2 @@
 print('My Student_ID is 21371434')
 print('My Name is 龚翼辉')
--- a/main.py
+++ b/main.py
@ -0,0 +1,3 @@
 import os
 os.system('python Function-21371434.py')
 os.system('echo Feature-21371434')
Author	SHA1	Message	Date
龚翼辉	2cda7b6efe	任务10	2 years ago
buaa21371434	91b39219b2	Merge pull request '21371413我要合并' (#18 ) from buaa21371413/mylab:Feature-21371413 into dev	2 years ago
尤世博	634f4d04ea	23	2 years ago
尤世博	64ea313d0d	23	2 years ago
尤世博	c9bba58564	Merge branch 'dev' into Feature-21371413	2 years ago
尤世博	19f2afcd14	y	2 years ago
尤世博	3c69da0d94	you	2 years ago
buaa21371434	20672b27ff	Merge pull request '合并请求喵喵喵' (#13 ) from buaa21371192/mylab:Feature-21371192 into dev	2 years ago
王晰	790f299755	MMM	2 years ago
尤世博	de39dbe6e2	y	2 years ago
王晰	152d27e01f	mmm	2 years ago
尤世博	363414a444	you	2 years ago
buaa21371434	c7c22f7e1a	Merge pull request '任务10第三问' (#6 ) from Feature-21371434 into dev	2 years ago
ling	74d4d441d1	任务10第三问	2 years ago
buaa21371413	9cad9d1f1d	Merge pull request '我要合并' (#5 ) from Feature-21371413 into dev	2 years ago
buaa21371193	bace02fda8	Merge pull request '21371193合并请求' (#4 ) from Feature-21371193 into dev	2 years ago
buaa21371427	897b2c5ee5	Merge pull request '21371427合并请求' (#2 ) from Feature-21371427 into dev	2 years ago
buaa21371192	4c6488a43a	Merge pull request '21371192合并请求' (#3 ) from Feature-21371192 into dev	2 years ago
buaa21371434	d0fb3a1a0f	Merge pull request '任务10' (#1 ) from Feature-21371434 into dev	2 years ago
JQKonatsu	c4dcd2b969	modify Function	2 years ago
尤世博	de97e1c3e2	you	2 years ago
王晰	e5d4461be9	mmm	2 years ago
ling	1f71389243	新分支	2 years ago
luochuan	597a7d4d3e	lab1-10	2 years ago
尤世博	0eb9ef5455	Conflict Solved	2 years ago
尤世博	62df3deb22	you3	2 years ago
尤世博	44dc9b52a5	Conflict Solved	2 years ago
尤世博	e1cc51189d	Merge branch 'Student-21371413' into dev	2 years ago
尤世博	f9b0826fc4	you2	2 years ago
尤世博	d69261aad6	you2	2 years ago
尤世博	bbf4b3dedc	you2	2 years ago
尤世博	ad07285d7d	Merge branch 'Student-21371413' into dev	2 years ago
尤世博	7cc3f81951	you	2 years ago
王晰	e7e7c3751e	Conflict Solved	2 years ago
王晰	858eb693d6	Merge branch 'Student-21371192' into dev	2 years ago
luochuan	418c126ff9	Conflict Solved	2 years ago
luochuan	d9a337097a	Conflict Solved	2 years ago
JQKonatsu	eb19cf0a28	Conflict Solved	2 years ago
王晰	303a130caa	For_main	2 years ago
luochuan	fe7ed5cac3	Merge branch 'Student-21371427' into dev	2 years ago
ling	132f11705b	1	2 years ago
JQKonatsu	24fff5345a	Merge branch 'Student-21371193' into dev	2 years ago
luochuan	6554786884	1	2 years ago
JQKonatsu	d5a6b60adf	modify main.py	2 years ago
王晰	436ec1c4e9	Merge branch 'dev' of https://bdgit.educoder.net/buaa21371434/mylab into dev	2 years ago
王晰	f9a584fee8	Merge branch 'Student-21371192' into dev	2 years ago
王晰	6da01d1dcb	forFuction	2 years ago
luochuan	668959beda	Merge branch 'dev' of https://bdgit.educoder.net/buaa21371434/mylab into dev	2 years ago
ling	77c74723c3	Merge branch 'dev' of https://bdgit.educoder.net/buaa21371434/mylab into dev	2 years ago
luochuan	b36909ffbd	1	2 years ago
ling	05b4f08646	Merge branch 'Student-21371434' into dev	2 years ago
JQKonatsu	9924c2921c	Merge branch 'dev' of https://bdgit.educoder.net/buaa21371434/mylab into dev	2 years ago
ling	05103148ce	1	2 years ago
JQKonatsu	42e9ed5af1	add Function.py	2 years ago
ling	75b17aa908	1	2 years ago
ling	0db9c4312d	1	2 years ago
ling	253ed6110c	1	2 years ago
		`@ -0,0 +1,2 @@`
							`print('My Student_ID is 21371192')`
							`print('My Name is 王晰')`
		`@ -0,0 +1,2 @@`
							`print('My Student_ID is 21371193')`
							`print('My Name is 张文津')`
		`@ -0,0 +1,2 @@`
							`print('My Student_ID is 21371413')`
							`print('My Name is 尤世博')`
`@ -1 +1,2 @@`
	`print('My Student_ID is 21371427')`	`print('My Student_ID is 21371427')`
		`print('My Name is luochuan')`
		`@ -0,0 +1,2 @@`
							`print('My Student_ID is 21371434')`
							`print('My Name is 龚翼辉')`