Merge pull request 'adwwa' (#14) from buaa20376399/BUAA-SE-2023-Lab01-Group17:Feature-20376399 into dev
commit
018d4bf1a5
@ -1 +1,2 @@
|
|||||||
print('My Student_ID is 20374236')
|
print('My Student_ID is 20374236')
|
||||||
|
print('My Name is cyx')
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
import os
|
import os
|
||||||
|
<<<<<<< HEAD
|
||||||
|
os.system('python Function-20376399.py')
|
||||||
|
os.system('echo Feature-20376399')
|
||||||
|
=======
|
||||||
os.system('python Function-20376092.py')
|
os.system('python Function-20376092.py')
|
||||||
os.system('echo Feature-20376092')
|
os.system('echo Feature-20376092')
|
||||||
|
>>>>>>> 997cbdd719016e6df6f7d8e1c74c11f52e093c6b
|
||||||
|
Loading…
Reference in new issue