Merge pull request 'adwwa' (#14) from buaa20376399/BUAA-SE-2023-Lab01-Group17:Feature-20376399 into dev

2 years ago · 018d4bf1a5
parent 997cbdd719 49277d4956
commit 018d4bf1a5
2 changed files with 6 additions and 0 deletions
--- a/Function-20374236.py
+++ b/Function-20374236.py
@ -1 +1,2 @@
 print('My Student_ID is 20374236')
+print('My Name is cyx')
--- a/main.py
+++ b/main.py
@ -1,3 +1,8 @@
 import os
+<<<<<<< HEAD
+os.system('python Function-20376399.py')
+os.system('echo Feature-20376399')
+=======
 os.system('python Function-20376092.py')
 os.system('echo Feature-20376092')
+>>>>>>> 997cbdd719016e6df6f7d8e1c74c11f52e093c6b